Merge remote-tracking branch 'upstream/master'

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index c64f0cd1fc7941ac15bba50cb7d16b0ce1817d6c..0eb62dc31aab20388e8047a39788ee0c3990e4dc 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,12 +3,13 @@
 namespace BookStack\Exceptions;
 
 use Exception;
 namespace BookStack\Exceptions;
 
 use Exception;

-use Illuminate\Contracts\Validation\ValidationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Validation\ValidationException;

 use Illuminate\Database\Eloquent\ModelNotFoundException;
 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;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Auth\Access\AuthorizationException;

+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 
 class Handler extends ExceptionHandler
 {
 
 class Handler extends ExceptionHandler
 {


@@ -26,10 +27,11 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
 
     /**
      * Report or log an exception.

-     *

      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  \Exception $e

+     * @return mixed
+     * @throws Exception

      */
     public function report(Exception $e)
     {
      */
     public function report(Exception $e)
     {


@@ -60,6 +62,11 @@ class Handler extends ExceptionHandler
             return response()->view('errors/' . $code, ['message' => $message], $code);
         }
 
             return response()->view('errors/' . $code, ['message' => $message], $code);
         }
 

+        // Handle 404 errors with a loaded session to enable showing user-specific information
+        if ($this->isExceptionType($e, NotFoundHttpException::class)) {
+            return \Route::respondWithRoute('fallback');
+        }
+

         return parent::render($request, $e);
     }
 
         return parent::render($request, $e);
     }
 


@@ -69,9 +76,12 @@ class Handler extends ExceptionHandler
      * @param $type
      * @return bool
      */
      * @param $type
      * @return bool
      */

-    protected function isExceptionType(Exception $e, $type) {
+    protected function isExceptionType(Exception $e, $type)
+    {

         do {
         do {

-            if (is_a($e, $type)) return true;
+            if (is_a($e, $type)) {
+                return true;
+            }

         } while ($e = $e->getPrevious());
         return false;
     }
         } while ($e = $e->getPrevious());
         return false;
     }


@@ -81,7 +91,8 @@ class Handler extends ExceptionHandler
      * @param Exception $e
      * @return string
      */
      * @param Exception $e
      * @return string
      */

-    protected function getOriginalMessage(Exception $e) {
+    protected function getOriginalMessage(Exception $e)
+    {

         do {
             $message = $e->getMessage();
         } while ($e = $e->getPrevious());
         do {
             $message = $e->getMessage();
         } while ($e = $e->getPrevious());


@@ -103,4 +114,16 @@ class Handler extends ExceptionHandler
 
         return redirect()->guest('login');
     }
 
         return redirect()->guest('login');
     }

+
+    /**
+     * Convert a validation exception into a JSON response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Validation\ValidationException  $exception
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function invalidJson($request, ValidationException $exception)
+    {
+        return response()->json($exception->errors(), $exception->status);
+    }

 }
 }