Merge branch '6.0' into 6.1

* 6.0:
  Typos In Comments
  Typos on 6.0 branch
  remove duplicated catch block
  s/<\br>/<br>
  [HttpClient] Fix retrying requests when the content is used by the strategy

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php

@@ -119,7 +119,7 @@ public function loginUser(object $user, string $firewallContext = 'main'): stati
         }
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
-        // required for compatibilty with Symfony 5.4
+        // required for compatibility with Symfony 5.4
         if (method_exists($token, 'isAuthenticated')) {
             $token->setAuthenticated(true, false);
         }

src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php

@@ -51,7 +51,7 @@ public function marshall(array $values, ?array &$failed): array
                     $serialized[$id][9] = "\x5F";
                 }
             } else {
-                // other arbitratry values are serialized using the decorated marshaller below
+                // other arbitrary values are serialized using the decorated marshaller below
                 $notSerialized[$id] = $value;
             }
         }

src/Symfony/Component/DomCrawler/FormFieldRegistry.php

@@ -46,7 +46,7 @@ public function add(FormField $field)
     }
 
     /**
-     * Removes a field based on the fully qualifed name and its children from the registry.
+     * Removes a field based on the fully qualified name and its children from the registry.
      */
     public function remove(string $name)
     {
@@ -63,7 +63,7 @@ public function remove(string $name)
     }
 
     /**
-     * Returns the value of the field based on the fully qualifed name and its children.
+     * Returns the value of the field based on the fully qualified name and its children.
      *
      * @return FormField|FormField[]|FormField[][]
      *

src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php

@@ -1062,8 +1062,6 @@ public function testChildren()
             $this->assertTrue(true, '->children() does not trigger a notice if the node has no children');
         } catch (\PHPUnit\Framework\Error\Notice $e) {
             $this->fail('->children() does not trigger a notice if the node has no children');
-        } catch (\PHPUnit\Framework\Error\Notice $e) {
-            $this->fail('->children() does not trigger a notice if the node has no children');
         }
     }
 

src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php

@@ -12,7 +12,7 @@
                 $class = substr($exception['class'], $separator);
                 ?>
                 <?php if ('' === $class) { ?>
-                    </br>
+                    <br>
                 <?php } else { ?>
                     <h3 class="trace-class">
                         <?php if ('' !== $namespace) { ?>

src/Symfony/Component/HttpClient/RetryableHttpClient.php

@@ -60,7 +60,7 @@ public function request(string $method, string $url, array $options = []): Respo
         return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options, &$retryCount, &$content, &$firstChunk) {
             $exception = null;
             try {
-                if ($chunk->isTimeout() || null !== $chunk->getInformationalStatus() || $context->getInfo('canceled')) {
+                if ($context->getInfo('canceled') || $chunk->isTimeout() || null !== $chunk->getInformationalStatus()) {
                     yield $chunk;
 
                     return;
@@ -118,6 +118,8 @@ public function request(string $method, string $url, array $options = []): Respo
 
             $delay = $this->getDelayFromHeader($context->getHeaders()) ?? $this->strategy->getDelay($context, !$exception && $chunk->isLast() ? $content : null, $exception);
             ++$retryCount;
+            $content = '';
+            $firstChunk = null;
 
             $this->logger->info('Try #{count} after {delay}ms'.($exception ? ': '.$exception->getMessage() : ', status code: '.$context->getStatusCode()), [
                 'count' => $retryCount,

src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php

@@ -62,21 +62,22 @@ public function testRetryWithBody()
     {
         $client = new RetryableHttpClient(
             new MockHttpClient([
-                new MockResponse('', ['http_code' => 500]),
-                new MockResponse('', ['http_code' => 200]),
+                new MockResponse('abc', ['http_code' => 500]),
+                new MockResponse('def', ['http_code' => 200]),
             ]),
             new class(GenericRetryStrategy::DEFAULT_RETRY_STATUS_CODES, 0) extends GenericRetryStrategy {
                 public function shouldRetry(AsyncContext $context, ?string $responseContent, ?TransportExceptionInterface $exception): ?bool
                 {
-                    return null === $responseContent ? null : 200 !== $context->getStatusCode();
+                    return 500 === $context->getStatusCode() && null === $responseContent ? null : 200 !== $context->getStatusCode();
                 }
             },
-            1
+            2
         );
 
         $response = $client->request('GET', 'http://example.com/foo-bar');
 
         self::assertSame(200, $response->getStatusCode());
+        self::assertSame('def', $response->getContent());
     }
 
     public function testRetryWithBodyKeepContent()

src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php

@@ -590,7 +590,7 @@ public function testDegradationWhenCacheLocked()
 
         $this->cacheConfig['stale_while_revalidate'] = 10;
 
-        // The prescence of Last-Modified makes this cacheable (because Response::isValidateable() then).
+        // The presence of Last-Modified makes this cacheable (because Response::isValidateable() then).
         $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'], 'Old response');
         $this->request('GET', '/'); // warm the cache
 

src/Symfony/Component/Lock/Store/DoctrineDbalStore.php

@@ -238,7 +238,7 @@ private function getCurrentTimestampStatement(): string
     }
 
     /**
-     * Checks wether current platform supports table creation within transaction.
+     * Checks whether current platform supports table creation within transaction.
      */
     private function platformSupportsTableCreationInTransaction(): bool
     {

src/Symfony/Component/Mailer/Transport/SendmailTransport.php

@@ -23,9 +23,9 @@
 /**
  * SendmailTransport for sending mail through a Sendmail/Postfix (etc..) binary.
  *
- * Transport can be instanciated through SendmailTransportFactory or NativeTransportFactory:
+ * Transport can be instantiated through SendmailTransportFactory or NativeTransportFactory:
  *
- * - SendmailTransportFactory to use most common sendmail path and recommanded options
+ * - SendmailTransportFactory to use most common sendmail path and recommended options
  * - NativeTransportFactory when configuration is set via php.ini
  *
  * @author Fabien Potencier <[email protected]>

src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php

@@ -145,7 +145,7 @@ public function initialize(): void
         if ($this->streamContextOptions) {
             $options = array_merge($options, $this->streamContextOptions);
         }
-        // do it unconditionnally as it will be used by STARTTLS as well if supported
+        // do it unconditionally as it will be used by STARTTLS as well if supported
         $options['ssl']['crypto_method'] = $options['ssl']['crypto_method'] ?? \STREAM_CRYPTO_METHOD_TLS_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         $streamContext = stream_context_create($options);
 

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

@@ -236,7 +236,7 @@ public function testClaimAbandonedMessageWithRaceCondition()
         $redis->expects($this->exactly(3))->method('xreadgroup')
             ->withConsecutive(
                 ['symfony', 'consumer', ['queue' => '0'], 1, null], // first call for pending messages
-                ['symfony', 'consumer', ['queue' => '0'], 1, null], // sencond call because of claimed message (redisid-123)
+                ['symfony', 'consumer', ['queue' => '0'], 1, null], // second call because of claimed message (redisid-123)
                 ['symfony', 'consumer', ['queue' => '>'], 1, null] // third call because of no result (other consumer claimed message redisid-123)
             )
             ->willReturnOnConsecutiveCalls([], [], []);
@@ -262,11 +262,11 @@ public function testClaimAbandonedMessage()
         $redis->expects($this->exactly(2))->method('xreadgroup')
             ->withConsecutive(
                 ['symfony', 'consumer', ['queue' => '0'], 1, null], // first call for pending messages
-                ['symfony', 'consumer', ['queue' => '0'], 1, null] // sencond call because of claimed message (redisid-123)
+                ['symfony', 'consumer', ['queue' => '0'], 1, null] // second call because of claimed message (redisid-123)
             )
             ->willReturnOnConsecutiveCalls(
                 [], // first call returns no result
-                ['queue' => [['message' => '{"body":"1","headers":[]}']]] // second call returns clamed message (redisid-123)
+                ['queue' => [['message' => '{"body":"1","headers":[]}']]] // second call returns claimed message (redisid-123)
             );
 
         $redis->expects($this->once())->method('xpending')->willReturn([[

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

@@ -162,7 +162,7 @@ public function setValue(object|array &$objectOrArray, string|PropertyPathInterf
                 // OR
                 // 2. its child is not passed by reference
                 //
-                // This may avoid uncessary value setting process for array elements.
+                // This may avoid unnecessary value setting process for array elements.
                 // For example:
                 // '[a][b][c]' => 'old-value'
                 // If you want to change its value to 'new-value',

src/Symfony/Component/PropertyInfo/Tests/Fixtures/DockBlockFallback.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
 /**
- * PhpDocExtractor should fallback from property -> accessor -> mutator when looking up dockblocks.
+ * PhpDocExtractor should fallback from property -> accessor -> mutator when looking up docblocks.
  *
  * @author Martin Rademacher <[email protected]>
  */

src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

@@ -378,7 +378,7 @@ private function validateEachObjectIn(iterable $collection, string $propertyPath
      * Validates a class node.
      *
      * A class node is a combination of an object with a {@link ClassMetadataInterface}
-     * instance. Each class node (conceptionally) has zero or more succeeding
+     * instance. Each class node (conceptually) has zero or more succeeding
      * property nodes:
      *
      *     (Article:class node)

src/Symfony/Contracts/Translation/Test/TranslatorTest.php

@@ -271,7 +271,7 @@ public function getChooseTests()
             ['This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0],
             // with double-quotes and id split accros lines
             ["This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1],
-            // esacape pipe
+            // escape pipe
             ['This is a text with | in it. Selector = 0.', '{0}This is a text with || in it. Selector = 0.|{1}This is a text with || in it. Selector = 1.', 0],
             // Empty plural set (2 plural forms) from a .PO file
             ['', '|', 1],