diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpClient] Fix Array to string conversion notice when parsing JSON error body with non-scalar detail property

Browse Source
This commit is contained in:
Malcolm Fell 2020-09-09 19:45:36 +12:00 committed by Nicolas Grekas
parent bb3bc7fc48
commit 76fa884319
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
View File

@ -60,7 +60,8 @@ trait HttpExceptionTrait
// see http://www.hydra-cg.com/spec/latest/core/#description-of-http-status-codes-and-errors // 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" : ''; $separator = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
$message = ($body['hydra:title'] ?? '').$separator.($body['hydra:description'] ?? ''); $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 // see RFC 7807 and https://jsonapi.org/format/#error-objects
$separator = isset($body['title'], $body['detail']) ? "\n\n" : ''; $separator = isset($body['title'], $body['detail']) ? "\n\n" : '';
$message = ($body['title'] ?? '').$separator.($body['detail'] ?? ''); $message = ($body['title'] ?? '').$separator.($body['detail'] ?? '');

24
src/Symfony/Component/HttpClient/Tests/Exception/HttpExceptionTraitTest.php
View File

@ -22,15 +22,24 @@ class HttpExceptionTraitTest extends TestCase
{ {
public function provideParseError(): iterable public function provideParseError(): iterable
{ {
yield ['application/ld+json', '{"hydra:title": "An error occurred", "hydra:description": "Some details"}']; $errorWithoutMessage = 'HTTP/1.1 400 Bad Request returned for "http://example.com".';
yield ['application/problem+json', '{"title": "An error occurred", "detail": "Some details"}'];
yield ['application/vnd.api+json', '{"title": "An error occurred", "detail": "Some details"}']; $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 * @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 = $this->createMock(ResponseInterface::class);
$response $response
@ -47,12 +56,7 @@ class HttpExceptionTraitTest extends TestCase
$e = new TestException($response); $e = new TestException($response);
$this->assertSame(400, $e->getCode()); $this->assertSame(400, $e->getCode());
$this->assertSame(<<<ERROR $this->assertSame($expectedMessage, $e->getMessage());
An error occurred
Some details
ERROR
, $e->getMessage());
} }
} }