Merge branch '6.3' into 6.4

* 6.3:
  [HttpClient] Psr18Client: parse HTTP Reason Phrase for Response
  Bump Symfony version to 5.4.31
  Update VERSION for 5.4.30
  Update CONTRIBUTORS for 5.4.30
  Update CHANGELOG for 5.4.30
  [Lock] Fix mongodb extension requirement in tests

Author: nicolas-grekas

CONTRIBUTORS.md

@@ -105,7 +105,7 @@ public function withOptions(array $options): static
     public function sendRequest(RequestInterface $request): Psr7ResponseInterface
     {
         try {
-            return $this->waitLoop->createPsr7Response($this->sendPsr7Request($request));
+            return HttplugWaitLoop::createPsr7Response($this->responseFactory, $this->streamFactory, $this->client, $this->sendPsr7Request($request), true);
         } catch (TransportExceptionInterface $e) {
             throw new NetworkException($e->getMessage(), $request, $e);
         }

src/Symfony/Component/HttpClient/HttplugClient.php

@@ -79,7 +79,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n
 
                     if ([, $promise] = $this->promisePool[$response] ?? null) {
                         unset($this->promisePool[$response]);
-                        $promise->resolve($this->createPsr7Response($response, true));
+                        $promise->resolve(self::createPsr7Response($this->responseFactory, $this->streamFactory, $this->client, $response, true));
                     }
                 } catch (\Exception $e) {
                     if ([$request, $promise] = $this->promisePool[$response] ?? null) {
@@ -114,9 +114,17 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n
         return $count;
     }
 
-    public function createPsr7Response(ResponseInterface $response, bool $buffer = false): Psr7ResponseInterface
+    public static function createPsr7Response(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory, HttpClientInterface $client, ResponseInterface $response, bool $buffer): Psr7ResponseInterface
     {
-        $psrResponse = $this->responseFactory->createResponse($response->getStatusCode());
+        $responseParameters = [$response->getStatusCode()];
+
+        foreach ($response->getInfo('response_headers') as $h) {
+            if (11 <= \strlen($h) && '/' === $h[4] && preg_match('#^HTTP/\d+(?:\.\d+)? (?:\d\d\d) (.+)#', $h, $m)) {
+                $responseParameters[1] = $m[1];
+            }
+        }
+
+        $psrResponse = $responseFactory->createResponse(...$responseParameters);
 
         foreach ($response->getHeaders(false) as $name => $values) {
             foreach ($values as $value) {
@@ -129,11 +137,11 @@ public function createPsr7Response(ResponseInterface $response, bool $buffer = f
         }
 
         if ($response instanceof StreamableInterface) {
-            $body = $this->streamFactory->createStreamFromResource($response->toStream(false));
+            $body = $streamFactory->createStreamFromResource($response->toStream(false));
         } elseif (!$buffer) {
-            $body = $this->streamFactory->createStreamFromResource(StreamWrapper::createResource($response, $this->client));
+            $body = $streamFactory->createStreamFromResource(StreamWrapper::createResource($response, $client));
         } else {
-            $body = $this->streamFactory->createStream($response->getContent(false));
+            $body = $streamFactory->createStream($response->getContent(false));
         }
 
         if ($body->isSeekable()) {

src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php

@@ -27,10 +27,12 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
+use Symfony\Component\HttpClient\Internal\HttplugWaitLoop;
 use Symfony\Component\HttpClient\Response\StreamableInterface;
 use Symfony\Component\HttpClient\Response\StreamWrapper;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface as HttpClientResponseInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
 if (!interface_exists(ClientInterface::class)) {
@@ -105,26 +107,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 
             $response = $this->client->request($request->getMethod(), (string) $request->getUri(), $options);
 
-            $psrResponse = $this->responseFactory->createResponse($response->getStatusCode());
-
-            foreach ($response->getHeaders(false) as $name => $values) {
-                foreach ($values as $value) {
-                    try {
-                        $psrResponse = $psrResponse->withAddedHeader($name, $value);
-                    } catch (\InvalidArgumentException $e) {
-                        // ignore invalid header
-                    }
-                }
-            }
-
-            $body = $response instanceof StreamableInterface ? $response->toStream(false) : StreamWrapper::createResource($response, $this->client);
-            $body = $this->streamFactory->createStreamFromResource($body);
-
-            if ($body->isSeekable()) {
-                $body->seek(0);
-            }
-
-            return $psrResponse->withBody($body);
+            return HttplugWaitLoop::createPsr7Response($this->responseFactory, $this->streamFactory, $this->client, $response, false);
         } catch (TransportExceptionInterface $e) {
             if ($e instanceof \InvalidArgumentException) {
                 throw new Psr18RequestException($e, $request);

src/Symfony/Component/HttpClient/Psr18Client.php

@@ -281,4 +281,19 @@ public function testInvalidHeaderResponse()
         $resultResponse = $client->sendRequest($request);
         $this->assertCount(1, $resultResponse->getHeaders());
     }
+
+    public function testResponseReasonPhrase()
+    {
+        $responseHeaders = [
+            'HTTP/1.1 103 Very Early Hints',
+        ];
+        $response = new MockResponse('body', ['response_headers' => $responseHeaders]);
+
+        $client = new HttplugClient(new MockHttpClient($response));
+        $request = $client->createRequest('POST', 'http://localhost:8057/post')
+            ->withBody($client->createStream('foo=0123456789'));
+
+        $resultResponse = $client->sendRequest($request);
+        $this->assertSame('Very Early Hints', $resultResponse->getReasonPhrase());
+    }
 }

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

@@ -101,4 +101,19 @@ public function testInvalidHeaderResponse()
         $resultResponse = $client->sendRequest($request);
         $this->assertCount(1, $resultResponse->getHeaders());
     }
+
+    public function testResponseReasonPhrase()
+    {
+        $responseHeaders = [
+            'HTTP/1.1 103 Very Early Hints',
+        ];
+        $response = new MockResponse('body', ['response_headers' => $responseHeaders]);
+
+        $client = new Psr18Client(new MockHttpClient($response));
+        $request = $client->createRequest('POST', 'http://localhost:8057/post')
+            ->withBody($client->createStream('foo=0123456789'));
+
+        $resultResponse = $client->sendRequest($request);
+        $this->assertSame('Very Early Hints', $resultResponse->getReasonPhrase());
+    }
 }

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

@@ -13,6 +13,7 @@
 
 use MongoDB\Client;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
 
@@ -29,13 +30,16 @@ class MongoDbSessionHandlerTest extends TestCase
     private MockObject&Client $mongo;
     private MongoDbSessionHandler $storage;
 
-    protected function setUp(): void
+    public static function setUpBeforeClass(): void
     {
-        parent::setUp();
-
         if (!class_exists(Client::class)) {
-            $this->markTestSkipped('The mongodb/mongodb package is required.');
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
 
         $this->mongo = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

@@ -11,20 +11,30 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use MongoDB\Collection;
+use MongoDB\Client;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Lock\Store\MongoDbStore;
 use Symfony\Component\Lock\Store\StoreFactory;
 
 /**
  * @author Alexandre Daubois <[email protected]>
  *
- * @requires extension mongo
+ * @requires extension mongodb
  */
 class MongoDbStoreFactoryTest extends TestCase
 {
+    public static function setupBeforeClass(): void
+    {
+        if (!class_exists(Client::class)) {
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
+        }
+    }
+
     public function testCreateMongoDbCollectionStore()
     {
-        $store = StoreFactory::createStore($this->createMock(\MongoDB\Collection::class));
+        $store = StoreFactory::createStore($this->createMock(Collection::class));
 
         $this->assertInstanceOf(MongoDbStore::class, $store);
     }

src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php

@@ -31,8 +31,8 @@ class MongoDbStoreTest extends AbstractStoreTestCase
 
     public static function setupBeforeClass(): void
     {
-        if (!class_exists(\MongoDB\Client::class)) {
-            self::markTestSkipped('The mongodb/mongodb package is required.');
+        if (!class_exists(Client::class)) {
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }
 
         $client = self::getMongoClient();