FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup error handler; re-add the validation error messages

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-04 11:53:02 -06:00
parent cb51e8036c
commit a4947fca79
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Exceptions/Handler.php
View File

@@ -2,7 +2,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use Illuminate\Validation\ValidationException; use \Illuminate\Validation\ValidationException;
use Log; use Log;
use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException;
use Exception; use Exception;
@@ -20,18 +20,17 @@ class Handler extends ExceptionHandler
\Illuminate\Auth\AuthenticationException::class, \Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class, \Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class, \Symfony\Component\HttpKernel\Exception\HttpException::class,
#\Illuminate\Database\Eloquent\ModelNotFoundException::class, \Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class, \Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class, \Illuminate\Validation\ValidationException::class,
]; ];
/** /**
* Report or log an exception. * Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc. * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
* * @param \Exception $exception
* @param \Exception $exception
* @return void * @return void
* @throws Exception
*/ */
public function report(Exception $exception) public function report(Exception $exception)
{ {
@@ -58,12 +57,14 @@ class Handler extends ExceptionHandler
'error' => [ 'error' => [
'code' => $exception->getCode(), 'code' => $exception->getCode(),
'message' => $exception->getMessage(), 'message' => $exception->getMessage(),
'trace' => $exception->getTrace()[0],
] ]
]; ];
$status = 400; $status = 400;
$http_code = $exception->getCode(); $http_code = $exception->getCode();
Log::error($exception->getMessage());
if ($this->isHttpException($exception)) { if ($this->isHttpException($exception)) {
$status = $exception->getStatusCode(); $status = $exception->getStatusCode();
$http_code = $exception->getStatusCode(); $http_code = $exception->getStatusCode();
@@ -77,10 +78,22 @@ class Handler extends ExceptionHandler
if($exception instanceof ValidationException) { if($exception instanceof ValidationException) {
$status = 400; $status = 400;
$http_code = 400; $http_code = 400;
$error['error']['failedRules'] = $exception->validator->failed();
$errors = $exception->errors();
$error_messages = [];
foreach($errors as $field => $error) {
$error_messages[] = implode(', ', $error);
}
$error['error']['message'] = implode(', ', $error_messages);
$error['error']['errors'] = $errors;
Log::error('Validation errors', $errors);
} }
Log::error($exception->getMessage()); # Only add trace if in dev
if(config('app.env') === 'dev') {
$error['error']['trace'] = $exception->getTrace()[0];
}
$error['error']['http_code'] = $http_code; $error['error']['http_code'] = $http_code;
return response()->json($error, $status); return response()->json($error, $status);