mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-06-08 07:35:19 +02:00
Code Issues Releases Wiki Activity

Move exception handling for Flarum exception classes to middleware

Browse Source 
Related to #118.
This commit is contained in:
Franz Liedke 2015-09-08 22:36:32 +02:00
parent 4b4cea4d87
commit b8ac49ffcc
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Actions/JsonApiAction.php
View File

@ -13,8 +13,6 @@ namespace Flarum\Api\Actions;
use Flarum\Api\Request; use Flarum\Api\Request;
use Illuminate\Contracts\Validation\ValidationException; use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException;
use Flarum\Core\Exceptions\ValidationFailureException;
use Flarum\Core\Exceptions\PermissionDeniedException;
use Zend\Diactoros\Response\JsonResponse; use Zend\Diactoros\Response\JsonResponse;
abstract class JsonApiAction implements Action abstract class JsonApiAction implements Action
@ -40,14 +38,6 @@ abstract class JsonApiAction implements Action
]; ];
} }
return new JsonResponse(['errors' => $errors], 422); return new JsonResponse(['errors' => $errors], 422);
} catch (\Flarum\Core\Exceptions\ValidationException $e) {
$errors = [];
foreach ($e->getMessages() as $path => $detail) {
$errors[] = compact('path', 'detail');
}
return new JsonResponse(['errors' => $errors], 422);
} catch (PermissionDeniedException $e) {
return new JsonResponse(null, 401);
} catch (ModelNotFoundException $e) { } catch (ModelNotFoundException $e) {
return new JsonResponse(null, 404); return new JsonResponse(null, 404);
} }

15
src/Api/Middleware/JsonApiErrors.php
View File

@ -10,6 +10,7 @@
namespace Flarum\Api\Middleware; namespace Flarum\Api\Middleware;
use Flarum\Core\Exceptions\JsonApiSerializable;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Diactoros\Response\JsonResponse; use Zend\Diactoros\Response\JsonResponse;
@ -22,23 +23,29 @@ class JsonApiErrors implements ErrorMiddlewareInterface
*/ */
public function __invoke($error, Request $request, Response $response, callable $out = null) public function __invoke($error, Request $request, Response $response, callable $out = null)
{ {
$errorObject = [ if ($error instanceof JsonApiSerializable) {
'title' => $error->getMessage(), $status = $error->getStatusCode();
];
$errors = $error->getErrors();
} else {
$status = 500; $status = 500;
$errors = [
['title' => $error->getMessage()]
];
// If it seems to be a valid HTTP status code, we pass on the // If it seems to be a valid HTTP status code, we pass on the
// exception's status. // exception's status.
$errorCode = $error->getCode(); $errorCode = $error->getCode();
if (is_int($errorCode) && $errorCode >= 400 && $errorCode < 600) { if (is_int($errorCode) && $errorCode >= 400 && $errorCode < 600) {
$status = $errorCode; $status = $errorCode;
} }
}
// JSON API errors must be collected in an array under the // JSON API errors must be collected in an array under the
// "errors" key in the top level of the document // "errors" key in the top level of the document
$data = [ $data = [
'errors' => [$errorObject] 'errors' => $errors,
]; ];
return new JsonResponse($data, $status); return new JsonResponse($data, $status);