From 76fa884319106971559850f9629033588ab047c6 Mon Sep 17 00:00:00 2001
From: Malcolm Fell <emarref@gmail.com>
Date: Wed, 9 Sep 2020 19:45:36 +1200
Subject: [PATCH] [HttpClient] Fix Array to string conversion notice when
 parsing JSON error body with non-scalar detail property

---
 .../Exception/HttpExceptionTrait.php          |  3 ++-
 .../Exception/HttpExceptionTraitTest.php      | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
index 76e650934b..5b7b448307 100644
--- a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
+++ b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
@@ -60,7 +60,8 @@ trait HttpExceptionTrait
                 // see http://www.hydra-cg.com/spec/latest/core/#description-of-http-status-codes-and-errors
                 $separator = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
                 $message = ($body['hydra:title'] ?? '').$separator.($body['hydra:description'] ?? '');
-            } elseif (isset($body['title']) || isset($body['detail'])) {
+            } elseif ((isset($body['title']) || isset($body['detail']))
+                && (is_scalar($body['title'] ?? '') && is_scalar($body['detail'] ?? ''))) {
                 // see RFC 7807 and https://jsonapi.org/format/#error-objects
                 $separator = isset($body['title'], $body['detail']) ? "\n\n" : '';
                 $message = ($body['title'] ?? '').$separator.($body['detail'] ?? '');
diff --git a/src/Symfony/Component/HttpClient/Tests/Exception/HttpExceptionTraitTest.php b/src/Symfony/Component/HttpClient/Tests/Exception/HttpExceptionTraitTest.php
index ac6c30df1f..c2771cc3ae 100644
--- a/src/Symfony/Component/HttpClient/Tests/Exception/HttpExceptionTraitTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/Exception/HttpExceptionTraitTest.php
@@ -22,15 +22,24 @@ class HttpExceptionTraitTest extends TestCase
 {
     public function provideParseError(): iterable
     {
-        yield ['application/ld+json', '{"hydra:title": "An error occurred", "hydra:description": "Some details"}'];
-        yield ['application/problem+json', '{"title": "An error occurred", "detail": "Some details"}'];
-        yield ['application/vnd.api+json', '{"title": "An error occurred", "detail": "Some details"}'];
+        $errorWithoutMessage = 'HTTP/1.1 400 Bad Request returned for "http://example.com".';
+
+        $errorWithMessage = <<<ERROR
+An error occurred
+
+Some details
+ERROR;
+
+        yield ['application/ld+json', '{"hydra:title": "An error occurred", "hydra:description": "Some details"}', $errorWithMessage];
+        yield ['application/problem+json', '{"title": "An error occurred", "detail": "Some details"}', $errorWithMessage];
+        yield ['application/vnd.api+json', '{"title": "An error occurred", "detail": "Some details"}', $errorWithMessage];
+        yield ['application/json', '{"title": "An error occurred", "detail": {"field_name": ["Some details"]}}', $errorWithoutMessage];
     }
 
     /**
      * @dataProvider provideParseError
      */
-    public function testParseError(string $mimeType, string $json): void
+    public function testParseError(string $mimeType, string $json, string $expectedMessage): void
     {
         $response = $this->createMock(ResponseInterface::class);
         $response
@@ -47,12 +56,7 @@ class HttpExceptionTraitTest extends TestCase
 
         $e = new TestException($response);
         $this->assertSame(400, $e->getCode());
-        $this->assertSame(<<<ERROR
-An error occurred
-
-Some details
-ERROR
-, $e->getMessage());
+        $this->assertSame($expectedMessage, $e->getMessage());
     }
 }