Merge branch '5.4' into 6.0

* 5.4:
  [HttpClient] Fix computing retry delay when using RetryableHttpClient
  [Uid] Fix validating UUID variant bits
  [Validator][UID] Stop to first ULID format violation
  [Bridge] Fix mkdir() race condition in ProxyCacheWarmer
  [Cache] update readme
  Bug #42343 [Security] Fix valid remember-me token exposure to the second consequent request
  Prevent exception if request stack is empty
  Psr18Client ignore invalid HTTP headers
  skip a transient test on AppVeyor

Author: nicolas-grekas

Psr18Client.php

@@ -101,7 +101,11 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 
             foreach ($response->getHeaders(false) as $name => $values) {
                 foreach ($values as $value) {
-                    $psrResponse = $psrResponse->withAddedHeader($name, $value);
+                    try {
+                        $psrResponse = $psrResponse->withAddedHeader($name, $value);
+                    } catch (\InvalidArgumentException $e) {
+                        // ignore invalid header
+                    }
                 }
             }
 

RetryableHttpClient.php

@@ -138,7 +138,7 @@ private function getDelayFromHeader(array $headers): ?int
     {
         if (null !== $after = $headers['retry-after'][0] ?? null) {
             if (is_numeric($after)) {
-                return (int) $after * 1000;
+                return (int) ($after * 1000);
             }
 
             if (false !== $time = strtotime($after)) {

Tests/Psr18ClientTest.php

@@ -13,10 +13,12 @@
 
 use Nyholm\Psr7\Factory\Psr17Factory;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
 use Symfony\Component\HttpClient\Psr18Client;
 use Symfony\Component\HttpClient\Psr18NetworkException;
 use Symfony\Component\HttpClient\Psr18RequestException;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
 class Psr18ClientTest extends TestCase
@@ -81,4 +83,22 @@ public function test404()
         $response = $client->sendRequest($factory->createRequest('GET', 'http://localhost:8057/404'));
         $this->assertSame(404, $response->getStatusCode());
     }
+
+    public function testInvalidHeaderResponse()
+    {
+        $responseHeaders = [
+            // space in header name not allowed in RFC 7230
+            ' X-XSS-Protection' => '0',
+            'Cache-Control' => 'no-cache',
+        ];
+        $response = new MockResponse('body', ['response_headers' => $responseHeaders]);
+        $this->assertArrayHasKey(' x-xss-protection', $response->getHeaders());
+
+        $client = new Psr18Client(new MockHttpClient($response));
+        $request = $client->createRequest('POST', 'http://localhost:8057/post')
+            ->withBody($client->createStream('foo=0123456789'));
+
+        $resultResponse = $client->sendRequest($request);
+        $this->assertCount(1, $resultResponse->getHeaders());
+    }
 }

Tests/RetryableHttpClientTest.php

@@ -187,4 +187,42 @@ public function testCancelOnTimeout()
             $response->cancel();
         }
     }
+
+    public function testRetryWithDelay()
+    {
+        $retryAfter = '0.46';
+
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', [
+                    'http_code' => 503,
+                    'response_headers' => [
+                        'retry-after' => $retryAfter,
+                    ],
+                ]),
+                new MockResponse('', [
+                    'http_code' => 200,
+                ]),
+            ]),
+            new GenericRetryStrategy(),
+            1,
+            $logger = new class() extends TestLogger {
+                public array $context = [];
+
+                public function log($level, $message, array $context = []): void
+                {
+                    $this->context = $context;
+                    parent::log($level, $message, $context);
+                }
+            },
+        );
+
+        $client->request('GET', 'http://example.com/foo-bar')->getContent();
+
+        $delay = $logger->context['delay'] ?? null;
+
+        $this->assertArrayHasKey('delay', $logger->context);
+        $this->assertNotNull($delay);
+        $this->assertSame((int) ($retryAfter * 1000), $delay);
+    }
 }