[HttpClient] Check satus code before decoding in TraceableResponse::toArray()

chalasr · chalasr · commit 59dc108c72d6 · 2020-11-03T18:45:11.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php
@@ -16,6 +16,8 @@
 use Symfony\Component\HttpClient\Exception\ServerException;
 use Symfony\Component\HttpClient\TraceableHttpClient;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
@@ -52,24 +54,36 @@ public function getHeaders(bool $throw = true): array
 
     public function getContent(bool $throw = true): string
     {
-        $this->content = $this->response->getContent(false);
-
         if ($throw) {
-            $this->checkStatusCode($this->response->getStatusCode());
+            try {
+                $this->checkStatusCode($this->response->getStatusCode());
+            } catch (HttpExceptionInterface $httpException) {
+                try {
+                    return $this->content = $this->response->getContent(false);
+                } catch (TransportExceptionInterface $e) {
+                    throw $httpException ?? $e;
+                }
+            }
         }
 
-        return $this->content;
+        return $this->content = $this->response->getContent(false);
     }
 
     public function toArray(bool $throw = true): array
     {
-        $this->content = $this->response->toArray(false);
-
         if ($throw) {
-            $this->checkStatusCode($this->response->getStatusCode());
+            try {
+                $this->checkStatusCode($this->response->getStatusCode());
+            } catch (HttpExceptionInterface $httpException) {
+                try {
+                    return $this->content = $this->response->toArray(false);
+                } catch (DecodingExceptionInterface | TransportExceptionInterface $e) {
+                    throw $httpException ?? $e;
+                }
+            }
         }
 
-        return $this->content;
+        return $this->content = $this->response->toArray(false);
     }
 
     public function cancel(): void
diff --git a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpClient\NativeHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\HttpClient\TraceableHttpClient;
+use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
@@ -100,4 +101,16 @@ public function testStream()
         $this->assertGreaterThan(1, \count($chunks));
         $this->assertSame('Symfony is awesome!', implode('', $chunks));
     }
+
+    public function testToArrayChecksStatusCodeBeforeDecoding()
+    {
+        $this->expectException(ClientExceptionInterface::class);
+
+        $sut = new TraceableHttpClient(new MockHttpClient($responseFactory = function (): MockResponse {
+            return new MockResponse('Errored.', ['http_code' => 400]);
+        }));
+
+        $response = $sut->request('GET', 'https://example.com/foo/bar');
+        $response->toArray();
+    }
 }
