github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-06 14:51:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore error details in JSON-API error formatter

Browse Source 
Fixes #1865. Refs #1843.
This commit is contained in:
Franz Liedke 2019-09-04 01:44:22 +02:00
parent a7b19284b9
commit 429b8e1a32
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/core/src/Foundation/ErrorHandling/JsonApiFormatter.php
View File

@ -26,12 +26,21 @@ class JsonApiFormatter implements HttpFormatter
public function format(HandledError $error, Request $request): Response public function format(HandledError $error, Request $request): Response
{ {
$document = new Document; $document = new Document;
$document->setErrors([
[ $data = [
'status' => (string) $error->getStatusCode(), 'status' => (string) $error->getStatusCode(),
'code' => $error->getType(), 'code' => $error->getType(),
], ];
]); $details = $error->getDetails();
if (empty($details)) {
$document->setErrors([$data]);
} else {
$document->setErrors(array_map(
function ($row) use ($data) { return array_merge($data, $row); },
$details
));
}
return new JsonApiResponse($document, $error->getStatusCode()); return new JsonApiResponse($document, $error->getStatusCode());
} }

26
framework/core/tests/integration/api/users/CreationTest.php
View File

@ -58,6 +58,32 @@ class CreationTest extends TestCase
); );
$this->assertEquals(422, $response->getStatusCode()); $this->assertEquals(422, $response->getStatusCode());
// The response body should contain details about the failed validation
$body = (string) $response->getBody();
$this->assertJson($body);
$this->assertEquals([
'errors' => [
[
'status' => '422',
'code' => 'validation_error',
'detail' => 'validation.required',
'source' => ['pointer' => '/data/attributes/username'],
],
[
'status' => '422',
'code' => 'validation_error',
'detail' => 'validation.required',
'source' => ['pointer' => '/data/attributes/email'],
],
[
'status' => '422',
'code' => 'validation_error',
'detail' => 'validation.required',
'source' => ['pointer' => '/data/attributes/password'],
],
],
], json_decode($body, true));
} }
/** /**