<?php
-namespace Oxbow\Exceptions;
+namespace BookStack\Exceptions;
use Exception;
+use Illuminate\Contracts\Validation\ValidationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use PhpSpec\Exception\Example\ErrorException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Auth\Access\AuthorizationException;
class Handler extends ExceptionHandler
{
* @var array
*/
protected $dontReport = [
+ AuthorizationException::class,
HttpException::class,
+ ModelNotFoundException::class,
+ ValidationException::class,
];
/**
/**
* Render an exception into an HTTP response.
*
- * @param \Illuminate\Http\Request $request
- * @param \Exception $e
+ * @param \Illuminate\Http\Request $request
+ * @param \Exception $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
{
- if($e instanceof NotifyException) {
- \Session::flash('error', $e->message);
- return response()->redirectTo($e->redirectLocation);
+ // Handle notify exceptions which will redirect to the
+ // specified location then show a notification message.
+ if ($e instanceof NotifyException) {
+ session()->flash('error', $e->message);
+ return redirect($e->redirectLocation);
+ }
+
+ // Handle pretty exceptions which will show a friendly application-fitting page
+ // Which will include the basic message to point the user roughly to the cause.
+ if (($e instanceof PrettyException || $e->getPrevious() instanceof PrettyException) && !config('app.debug')) {
+ $message = ($e instanceof PrettyException) ? $e->getMessage() : $e->getPrevious()->getMessage();
+ $code = ($e->getCode() === 0) ? 500 : $e->getCode();
+ return response()->view('errors/' . $code, ['message' => $message], $code);
}
return parent::render($request, $e);