[HttpClient] Append url to JsonException messages.

GromNaN · GromNaN · commit 2f61d87051d4 · 2020-02-21T23:54:03.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -147,21 +147,21 @@ public function toArray(bool $throw = true): array
         $contentType = $this->headers['content-type'][0] ?? 'application/json';
 
         if (!preg_match('/\bjson\b/i', $contentType)) {
-            throw new JsonException(sprintf('Response content-type is "%s" while a JSON-compatible one was expected.', $contentType));
+            throw new JsonException(sprintf('Response content-type is "%s" while a JSON-compatible one was expected for "%s".', $contentType, $this->getInfo('url')));
         }
 
         try {
             $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0));
         } catch (\JsonException $e) {
-            throw new JsonException($e->getMessage(), $e->getCode());
+            throw new JsonException(sprintf('JSON error: %s, from "%s".', $e->getMessage(), $this->getInfo('url')), $e->getCode());
         }
 
         if (\PHP_VERSION_ID < 70300 && JSON_ERROR_NONE !== json_last_error()) {
-            throw new JsonException(json_last_error_msg(), json_last_error());
+            throw new JsonException(sprintf('JSON error: %s, from "%s".', json_last_error_msg(), $this->getInfo('url')), json_last_error());
         }
 
         if (!\is_array($content)) {
-            throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned.', \gettype($content)));
+            throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned by "%s".', \gettype($content), $this->getInfo('url')));
         }
 
         if (null !== $this->content) {
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -38,31 +38,31 @@ public function toArrayErrors()
         yield [
             'content' => '{}',
             'responseHeaders' => ['content-type' => 'plain/text'],
-            'message' => 'Response content-type is "plain/text" while a JSON-compatible one was expected.',
+            'message' => 'Response content-type is "plain/text" while a JSON-compatible one was expected for "https://example.com/file.json".',
         ];
 
         yield [
             'content' => 'not json',
             'responseHeaders' => [],
-            'message' => 'Syntax error',
+            'message' => 'JSON error: Syntax error, from "https://example.com/file.json".',
         ];
 
         yield [
             'content' => '[1,2}',
             'responseHeaders' => [],
-            'message' => 'State mismatch (invalid or malformed JSON)',
+            'message' => 'JSON error: State mismatch (invalid or malformed JSON), from "https://example.com/file.json".',
         ];
 
         yield [
             'content' => '"not an array"',
             'responseHeaders' => [],
-            'message' => 'JSON content was expected to decode to an array, string returned.',
+            'message' => 'JSON content was expected to decode to an array, string returned by "https://example.com/file.json".',
         ];
 
         yield [
             'content' => '8',
             'responseHeaders' => [],
-            'message' => 'JSON content was expected to decode to an array, integer returned.',
+            'message' => 'JSON content was expected to decode to an array, integer returned by "https://example.com/file.json".',
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -147,21 +147,21 @@ public function toArray(bool $throw = true): array`
`147`	`147`	`$contentType = $this->headers['content-type'][0] ?? 'application/json';`
`148`	`148`
`149`	`149`	`if (!preg_match('/\bjson\b/i', $contentType)) {`
`150`		`- throw new JsonException(sprintf('Response content-type is "%s" while a JSON-compatible one was expected.', $contentType));`
	`150`	`+ throw new JsonException(sprintf('Response content-type is "%s" while a JSON-compatible one was expected for "%s".', $contentType, $this->getInfo('url')));`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`try {`
`154`	`154`	`$content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING \| (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0));`
`155`	`155`	`} catch (\JsonException $e) {`
`156`		`- throw new JsonException($e->getMessage(), $e->getCode());`
	`156`	`+ throw new JsonException(sprintf('JSON error: %s, from "%s".', $e->getMessage(), $this->getInfo('url')), $e->getCode());`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if (\PHP_VERSION_ID < 70300 && JSON_ERROR_NONE !== json_last_error()) {`
`160`		`- throw new JsonException(json_last_error_msg(), json_last_error());`
	`160`	`+ throw new JsonException(sprintf('JSON error: %s, from "%s".', json_last_error_msg(), $this->getInfo('url')), json_last_error());`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`if (!\is_array($content)) {`
`164`		`- throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned.', \gettype($content)));`
	`164`	`+ throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned by "%s".', \gettype($content), $this->getInfo('url')));`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (null !== $this->content) {`