bug #31982 [HttpClient] fix Psr18Client handling of non-200 response codes (nicolas-grekas)

fabpot · fabpot · commit 2f4f8c05d79e · 2019-06-11T12:37:06.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] fix Psr18Client handling of non-200 response codes | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31979 | License | MIT | Doc PR | - Commits ------- 4a79894 [HttpClient] fix Psr18Client handling of non-200 response codes
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -73,13 +73,13 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 
             $psrResponse = $this->responseFactory->createResponse($response->getStatusCode());
 
-            foreach ($response->getHeaders() as $name => $values) {
+            foreach ($response->getHeaders(false) as $name => $values) {
                 foreach ($values as $value) {
                     $psrResponse = $psrResponse->withAddedHeader($name, $value);
                 }
             }
 
-            return $psrResponse->withBody($this->streamFactory->createStream($response->getContent()));
+            return $psrResponse->withBody($this->streamFactory->createStream($response->getContent(false)));
         } catch (TransportExceptionInterface $e) {
             if ($e instanceof \InvalidArgumentException) {
                 throw new Psr18RequestException($e, $request);
diff --git a/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php b/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php
@@ -74,4 +74,13 @@ public function testRequestException()
         $this->expectException(Psr18RequestException::class);
         $client->sendRequest($factory->createRequest('BAD.METHOD', 'http://localhost:8057'));
     }
+
+    public function test404()
+    {
+        $factory = new Psr17Factory();
+        $client = new Psr18Client(new NativeHttpClient());
+
+        $response = $client->sendRequest($factory->createRequest('GET', 'http://localhost:8057/404'));
+        $this->assertSame(404, $response->getStatusCode());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,13 @@ public function sendRequest(RequestInterface $request): ResponseInterface`
`73`	`73`
`74`	`74`	`$psrResponse = $this->responseFactory->createResponse($response->getStatusCode());`
`75`	`75`
`76`		`- foreach ($response->getHeaders() as $name => $values) {`
	`76`	`+ foreach ($response->getHeaders(false) as $name => $values) {`
`77`	`77`	`foreach ($values as $value) {`
`78`	`78`	`$psrResponse = $psrResponse->withAddedHeader($name, $value);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- return $psrResponse->withBody($this->streamFactory->createStream($response->getContent()));`
	`82`	`+ return $psrResponse->withBody($this->streamFactory->createStream($response->getContent(false)));`
`83`	`83`	`} catch (TransportExceptionInterface $e) {`
`84`	`84`	`if ($e instanceof \InvalidArgumentException) {`
`85`	`85`	`throw new Psr18RequestException($e, $request);`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,13 @@ public function testRequestException()`
`74`	`74`	`$this->expectException(Psr18RequestException::class);`
`75`	`75`	`$client->sendRequest($factory->createRequest('BAD.METHOD', 'http://localhost:8057'));`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ public function test404()`
	`79`	`+ {`
	`80`	`+ $factory = new Psr17Factory();`
	`81`	`+ $client = new Psr18Client(new NativeHttpClient());`
	`82`	`+`
	`83`	`+ $response = $client->sendRequest($factory->createRequest('GET', 'http://localhost:8057/404'));`
	`84`	`+ $this->assertSame(404, $response->getStatusCode());`
	`85`	`+ }`
`77`	`86`	`}`