Use Symfony as a last resort exception handler

This prevents white screens if something goes wrong with Whoops setup.
laravel · Jun 4, 2017 · f2cd3c3 · f2cd3c3
1 parent 1b9d74d
commit f2cd3c3
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -248,15 +248,19 @@ protected function convertExceptionToResponse(Exception $e)
         $headers = $this->isHttpException($e) ? $e->getHeaders() : [];
         $statusCode = $this->isHttpException($e) ? $e->getStatusCode() : 500;
 
-        if (config('app.debug')) {
-            return SymfonyResponse::create(
-                $this->renderExceptionWithWhoops($e), $statusCode, $headers
-            );
-        } else {
-            return SymfonyResponse::create(
-                $this->renderExceptionWithSymfony($e), $statusCode, $headers
-            );
+        $showStackTraces = config('app.debug');
+
+        try {
+            $content = $showStackTraces
+                ? $this->renderExceptionWithWhoops($e)
+                : $this->renderExceptionWithSymfony($e, $showStackTraces);
+        } finally {
+            $content = $content ?? $this->renderExceptionWithSymfony($e, $showStackTraces);
         }
+
+        return SymfonyResponse::create(
+            $content, $statusCode, $headers
+        );
     }
 
     /**
@@ -282,11 +286,11 @@ protected function renderExceptionWithWhoops(Exception $e)
      * @param  \Exception  $e
      * @return string
      */
-    protected function renderExceptionWithSymfony(Exception $e)
+    protected function renderExceptionWithSymfony(Exception $e, $showStackTraces)
     {
         $e = FlattenException::create($e);
 
-        return (new SymfonyExceptionHandler(false))->getHtml($e);
+        return (new SymfonyExceptionHandler($showStackTraces))->getHtml($e);
     }
 
     /**