Merge branch '5.2' into 5.3

* 5.2:
  Use PHP_OS_FAMILY if possible
  Fix tests
  Fix minor typos
  [WebProfilerBundle] Fix the values of some CSS properties
  [Yaml] Fixed an exception message
  Fix ctype_digit deprecation
  Add a Special Case for Translating Choices in en_US_POSIX

Author: nicolas-grekas

.github/workflows/unit-tests.yml

@@ -139,7 +139,7 @@ jobs:
         if: "${{ matrix.php == '8.0' && ! matrix.mode }}"
         run: |
           sed -i 's/"\*\*\/Tests\/"//' composer.json
-          composer install --optimize-autoloader
+          composer install -q --optimize-autoloader
           SYMFONY_PATCH_TYPE_DECLARATIONS=force=1 php .github/patch-types.php
           SYMFONY_PATCH_TYPE_DECLARATIONS=force=1 php .github/patch-types.php # ensure the script is idempotent
           echo PHPUNIT="$PHPUNIT,legacy" >> $GITHUB_ENV

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -209,7 +209,7 @@ public function getDescribeCallableTestData()
     }
 
     /** @dataProvider getClassDescriptionTestData */
-    public function testGetClassDecription($object, $expectedDescription)
+    public function testGetClassDescription($object, $expectedDescription)
     {
         $this->assertEquals($expectedDescription, $this->getDescriptor()->getClassDescription($object));
     }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig

@@ -1,5 +1,5 @@
 .container {
-    max-width: auto;
+    max-width: none;
     margin: 0;
     padding: 0;
 }
@@ -28,5 +28,5 @@
 }
 
 .exception-message-wrapper .container {
-    min-height: auto;
+    min-height: unset;
 }

src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php

@@ -100,7 +100,7 @@ protected function writeError(OutputInterface $output, \Exception $error)
 
     private function getEofShortcut(): string
     {
-        if (false !== strpos(\PHP_OS, 'WIN')) {
+        if ('Windows' === \PHP_OS_FAMILY) {
             return '<comment>Ctrl+Z</comment> then <comment>Enter</comment>';
         }
 

src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

@@ -1033,14 +1033,14 @@ public function testMaxSecondsBetweenRedraws()
         $bar->setRedrawFrequency(4); // disable step based redraws
         $bar->start();
 
-        $bar->setProgress(1); // No treshold hit, no redraw
+        $bar->setProgress(1); // No threshold hit, no redraw
         $bar->maxSecondsBetweenRedraws(2);
         sleep(1);
         $bar->setProgress(2); // Still no redraw because it takes 2 seconds for a redraw
         sleep(1);
         $bar->setProgress(3); // 1+1 = 2 -> redraw finally
         $bar->setProgress(4); // step based redraw freq hit, redraw even without sleep
-        $bar->setProgress(5); // No treshold hit, no redraw
+        $bar->setProgress(5); // No threshold hit, no redraw
         $bar->maxSecondsBetweenRedraws(3);
         sleep(2);
         $bar->setProgress(6); // No redraw even though 2 seconds passed. Throttling has priority
@@ -1071,7 +1071,7 @@ public function testMinSecondsBetweenRedraws()
         $bar->setProgress(3); // 1 second passed but we changed threshold, should not draw
         sleep(1);
         $bar->setProgress(4); // 1+1 seconds = 2 seconds passed which conforms threshold, draw
-        $bar->setProgress(5); // No treshold hit, no redraw
+        $bar->setProgress(5); // No threshold hit, no redraw
 
         rewind($output->getStream());
         $this->assertEquals(

src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php

@@ -218,7 +218,7 @@ public function testAskMultilineQuestionIncludesHelpText()
     {
         $expected = 'Write an essay (press Ctrl+D to continue)';
 
-        if (false !== strpos(\PHP_OS, 'WIN')) {
+        if ('Windows' === \PHP_OS_FAMILY) {
             $expected = 'Write an essay (press Ctrl+Z then Enter to continue)';
         }
 

src/Symfony/Component/ErrorHandler/DebugClassLoader.php

@@ -208,7 +208,7 @@ public function __construct(callable $classLoader)
             } elseif (substr($test, -\strlen($file)) === $file) {
                 // filesystem is case insensitive and realpath() normalizes the case of characters
                 self::$caseCheck = 1;
-            } elseif (false !== stripos(\PHP_OS, 'darwin')) {
+            } elseif ('Darwin' === \PHP_OS_FAMILY) {
                 // on MacOSX, HFS+ is case insensitive but realpath() doesn't normalize the case of characters
                 self::$caseCheck = 2;
             } else {

src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php

@@ -614,7 +614,7 @@ public function testAmqpStampHeadersAreUsed()
         $connection->publish('body', ['Foo' => 'X'], 0, new AmqpStamp(null, \AMQP_NOPARAM, ['headers' => ['Bar' => 'Y']]));
     }
 
-    public function testAmqpStampDelireryModeIsUsed()
+    public function testAmqpStampDeliveryModeIsUsed()
     {
         $factory = new TestAmqpFactory(
             $this->createMock(\AMQPConnection::class),

src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php

@@ -177,12 +177,12 @@ public function testEnvelopeKeepOnlyTheLast10Stamps()
         $senderLocator = $this->createMock(ContainerInterface::class);
         $senderLocator->expects($this->once())->method('has')->willReturn(true);
         $senderLocator->expects($this->once())->method('get')->willReturn($sender);
-        $retryStategy = $this->createMock(RetryStrategyInterface::class);
-        $retryStategy->expects($this->once())->method('isRetryable')->willReturn(true);
-        $retryStategy->expects($this->once())->method('getWaitingTime')->willReturn(1000);
+        $retryStrategy = $this->createMock(RetryStrategyInterface::class);
+        $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(true);
+        $retryStrategy->expects($this->once())->method('getWaitingTime')->willReturn(1000);
         $retryStrategyLocator = $this->createMock(ContainerInterface::class);
         $retryStrategyLocator->expects($this->once())->method('has')->willReturn(true);
-        $retryStrategyLocator->expects($this->once())->method('get')->willReturn($retryStategy);
+        $retryStrategyLocator->expects($this->once())->method('get')->willReturn($retryStrategy);
 
         $listener = new SendFailedMessageForRetryListener($senderLocator, $retryStrategyLocator);
 

src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php

@@ -1988,7 +1988,7 @@ public function testPassConstraintToViolation()
         $this->assertSame($constraint, $violations[0]->getConstraint());
     }
 
-    public function testCollectionConstraitViolationHasCorrectContext()
+    public function testCollectionConstraintViolationHasCorrectContext()
     {
         $data = [
             'foo' => 'fooValue',