mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-24 13:16:08 +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

21
src/Api/ExceptionHandler.php
View File

@@ -5,8 +5,6 @@ use Illuminate\Foundation\Exceptions\Handler;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Flarum\Core\Exceptions\ValidationFailureException;
use Flarum\Core\Exceptions\PermissionDeniedException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Config;
@@ -31,13 +29,6 @@ class ExceptionHandler extends Handler
public function render($request, Exception $e)
{
if ($request->is('api/*')) {
if ($e instanceof ValidationFailureException) {
return $this->renderValidationException($e);
}
if ($e instanceof PermissionDeniedException) {
return new Response(null, 401);
}
$error = [];
if (Config::get('app.debug')) {
$error['code'] = (new \ReflectionClass($e))->getShortName();
@@ -60,16 +51,4 @@ class ExceptionHandler extends Handler
{
return new JsonResponse(['errors' => $errors], $httpCode);
}
protected function renderValidationException(ValidationFailureException $e)
{
$errors = [];
foreach ($e->getErrors()->getMessages() as $field => $messages) {
$errors[] = [
'detail' => implode("\n", $messages),
'path' => $field
];
}
return $this->renderErrors($errors, 422);
}
}