mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-10 22:44:25 +02:00
Code Issues Releases Wiki Activity

Move some API error handling code around. It still sucks though

Browse Source
This commit is contained in:
Toby Zerner
2015-05-07 16:08:20 +09:30
parent a5b2a3da03
commit b5169512cb
4 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Api/Actions/SerializeAction.php
View File

@@ -3,8 +3,12 @@
use Flarum\Api\Request;
use Flarum\Api\JsonApiRequest;
use Flarum\Api\JsonApiResponse;
use Flarum\Core\Exceptions\ValidationFailureException;
use Flarum\Core\Exceptions\PermissionDeniedException;
use Tobscure\JsonApi\SerializerInterface;
use Tobscure\JsonApi\Criteria;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse;
abstract class SerializeAction implements ActionInterface
{
@@ -68,7 +72,20 @@ abstract class SerializeAction implements ActionInterface
{
$request = static::buildJsonApiRequest($request);
$data = $this->data($request, $response = new JsonApiResponse);
try {
$data = $this->data($request, $response = new JsonApiResponse);
} catch (ValidationFailureException $e) {
$errors = [];
foreach ($e->getErrors()->getMessages() as $field => $messages) {
$errors[] = [
'detail' => implode("\n", $messages),
'path' => $field
];
}
return new JsonResponse(['errors' => $errors], 422);
} catch (PermissionDeniedException $e) {
return new JsonResponse(null, 401);
}
$serializer = new static::$serializer($request->actor, $request->include, $request->link);