Merge pull request #958 from pxgamer/feature/exception-handler-methods

taylorotwell · web-flow · commit 5d1d1ba8dbc5 · 2019-08-28T16:21:05.000-05:00
[5.8] Add support for reportable, renderable, and responsable exceptions
diff --git a/src/Exceptions/Handler.php b/src/Exceptions/Handler.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Http\Response;
+use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -36,6 +37,10 @@ public function report(Exception $e)
             return;
         }
 
+        if (method_exists($e, 'report')) {
+            return $e->report();
+        }
+
         try {
             $logger = app('Psr\Log\LoggerInterface');
         } catch (Exception $ex) {
@@ -82,6 +87,12 @@ protected function shouldntReport(Exception $e)
      */
     public function render($request, Exception $e)
     {
+        if (method_exists($e, 'render')) {
+            return $e->render($request);
+        } elseif ($e instanceof Responsable) {
+            return $e->toResponse($request);
+        }
+
         if ($e instanceof HttpResponseException) {
             return $e->getResponse();
         } elseif ($e instanceof ModelNotFoundException) {
