replace GPL diff lib with MIT lib

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d18a9bd2c0a2f66a7b28eb142f1d09c42a5e376c..14d553ed0bb359b200dfc91a95bdc05ff92501ba 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,10 +1,14 @@
 <?php
 
 <?php
 

-namespace Oxbow\Exceptions;
+namespace BookStack\Exceptions;

 
 use Exception;
 
 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 Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

+use Illuminate\Auth\Access\AuthorizationException;

 
 class Handler extends ExceptionHandler
 {
 
 class Handler extends ExceptionHandler
 {


@@ -14,7 +18,10 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontReport = [
      * @var array
      */
     protected $dontReport = [

+        AuthorizationException::class,

         HttpException::class,
         HttpException::class,

+        ModelNotFoundException::class,
+        ValidationException::class,

     ];
 
     /**
     ];
 
     /**


@@ -32,17 +39,27 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
     /**
      * 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)
     {
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $e)
     {

-        if($e instanceof NotifyException) {
+        // 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 response()->redirectTo($e->redirectLocation);
         }
 
             \Session::flash('error', $e->message);
             return response()->redirectTo($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);
     }
 }
         return parent::render($request, $e);
     }
 }