[HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray()

jeroennoten · jeroennoten · commit 897b21df5aa5 · 2020-06-02T14:57:19.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -132,7 +132,7 @@ public function getContent(bool $throw = true): string
     public function toArray(bool $throw = true): array
     {
         if ('' === $content = $this->getContent($throw)) {
-            throw new TransportException('Response body is empty.');
+            throw new JsonException('Response body is empty.');
         }
 
         if (null !== $this->jsonData) {
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Symfony\Component\HttpClient\Tests\Response\Response;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\Exception\JsonException;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
+/**
+ * Test methods from Symfony\Component\HttpClient\Response\ResponseTrait.
+ */
+class MockResponseTest extends TestCase
+{
+    /**
+     * @dataProvider toArrayErrors
+     */
+    public function testToArrayError($content, $responseHeaders, $message)
+    {
+        $this->expectException(JsonException::class);
+        $this->expectExceptionMessage($message);
+
+        $response = new MockResponse($content, ['response_headers' => $responseHeaders]);
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.json', [], $response);
+        $response->toArray();
+    }
+
+    public function toArrayErrors()
+    {
+        yield [
+            'content' => '',
+            'responseHeaders' => [],
+            'message' => 'Response body is empty.',
+        ];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function getContent(bool $throw = true): string`
`132`	`132`	`public function toArray(bool $throw = true): array`
`133`	`133`	`{`
`134`	`134`	`if ('' === $content = $this->getContent($throw)) {`
`135`		`- throw new TransportException('Response body is empty.');`
	`135`	`+ throw new JsonException('Response body is empty.');`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if (null !== $this->jsonData) {`