Tweak renderable exceptions.

laravel · Apr 1, 2017 · c8a9413 · c8a9413
1 parent 18bb4df
commit c8a9413
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -5,6 +5,7 @@
 use Exception;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
+use Illuminate\Routing\Router;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\Container;
@@ -106,8 +107,8 @@ protected function shouldntReport(Exception $e)
      */
     public function render($request, Exception $e)
     {
-        if (method_exists($e, 'render')) {
-            return $e->render($request);
+        if (method_exists($e, 'render') && $response = $e->render($request)) {
+            return Router::prepareResponse($request, $response);
         }
 
         $e = $this->prepareException($e);

diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -599,7 +599,7 @@ protected function sortMiddleware(Collection $middlewares)
      * @param  mixed  $response
      * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      */
-    public function prepareResponse($request, $response)
+    public static function prepareResponse($request, $response)
     {
         if ($response instanceof PsrResponseInterface) {
             $response = (new HttpFoundationFactory)->createResponse($response);