mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-03-14 20:39:44 +01:00
Code Issues Projects Releases Wiki Activity

Improvements to the exception handler

Browse Source
This commit is contained in:
Graham Campbell 2015-06-12 23:27:30 +01:00
parent 0cc0cdc9e3
commit 5ceb700b4c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Exceptions/Handler.php
View File

@ -11,11 +11,11 @@
namespace CachetHQ\Cachet\Exceptions;
use CachetHQ\Cachet\Repositories\InvalidModelValidationException;
use Exception;
use GrahamCampbell\Exceptions\ExceptionHandler as ExceptionHandler;
use GrahamCampbell\Exceptions\ExceptionHandler;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Facades\Response;
use Symfony\Component\HttpKernel\Exception\HttpNotFoundException;
class Handler extends ExceptionHandler
{
@ -25,7 +25,7 @@ class Handler extends ExceptionHandler
* @var string[]
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException',
HttpNotFoundException::class,
];
/**
@ -38,14 +38,8 @@ class Handler extends ExceptionHandler
*/
public function render($request, Exception $e)
{
if ($request->is('api*')) {
if ($e instanceof InvalidModelValidationException) {
return Response::make(['status_code' => 400, 'message' => 'Bad Request'], 400);
}
if ($e instanceof ModelNotFoundException) {
return Response::make(['status_code' => 404, 'error' => 'Resource not found'], 404);
}
if ($e instanceof ModelNotFoundException) {
$e = new HttpNotFoundException('Resource not found');
}
return parent::render($request, $e);