Merge branch 'registerable-exception-renderer'

Author: taylorotwell

composer.json

@@ -81,7 +81,6 @@
         "aws/aws-sdk-php": "^3.155",
         "doctrine/dbal": "^2.12|^3.0",
         "fakerphp/faker": "^1.9.2",
-        "filp/whoops": "^2.8",
         "guzzlehttp/guzzle": "^7.2",
         "league/flysystem-aws-s3-v3": "^2.0",
         "league/flysystem-ftp": "^2.0",

src/Illuminate/Contracts/Foundation/ExceptionRenderer.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Illuminate\Contracts\Foundation;
+
+interface ExceptionRenderer
+{
+    /**
+     * Renders the given exception as HTML.
+     *
+     * @param  \Throwable  $throwable
+     * @return string
+     */
+    public function render($throwable);
+}

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -6,9 +6,9 @@
 use Exception;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
+use Illuminate\Contracts\Foundation\ExceptionRenderer;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\MultipleRecordsFoundException;
@@ -37,8 +37,6 @@
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
-use Whoops\Handler\HandlerInterface;
-use Whoops\Run as Whoops;
 
 class Handler implements ExceptionHandlerContract
 {
@@ -499,43 +497,23 @@ protected function convertExceptionToResponse(Throwable $e)
     protected function renderExceptionContent(Throwable $e)
     {
         try {
-            return config('app.debug') && class_exists(Whoops::class)
-                        ? $this->renderExceptionWithWhoops($e)
+            return config('app.debug') && app()->has(ExceptionRenderer::class)
+                        ? $this->renderExceptionWithCustomRenderer($e)
                         : $this->renderExceptionWithSymfony($e, config('app.debug'));
         } catch (Exception $e) {
             return $this->renderExceptionWithSymfony($e, config('app.debug'));
         }
     }
 
     /**
-     * Render an exception to a string using "Whoops".
+     * Render an exception to a string using the registered `ExceptionRenderer`.
      *
      * @param  \Throwable  $e
      * @return string
      */
-    protected function renderExceptionWithWhoops(Throwable $e)
+    protected function renderExceptionWithCustomRenderer(Throwable $e)
     {
-        return tap(new Whoops, function ($whoops) {
-            $whoops->appendHandler($this->whoopsHandler());
-
-            $whoops->writeToOutput(false);
-
-            $whoops->allowQuit(false);
-        })->handleException($e);
-    }
-
-    /**
-     * Get the Whoops handler for the application.
-     *
-     * @return \Whoops\Handler\Handler
-     */
-    protected function whoopsHandler()
-    {
-        try {
-            return app(HandlerInterface::class);
-        } catch (BindingResolutionException $e) {
-            return (new WhoopsHandler)->forDebug();
-        }
+        return app(ExceptionRenderer::class)->render($e);
     }
 
     /**

src/Illuminate/Foundation/Exceptions/Whoops/WhoopsExceptionRenderer.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Illuminate\Foundation\Exceptions\Whoops;
+
+use Illuminate\Contracts\Foundation\ExceptionRenderer;
+use function tap;
+use Whoops\Run as Whoops;
+
+class WhoopsExceptionRenderer implements ExceptionRenderer
+{
+    /**
+     * Renders the given exception as HTML.
+     *
+     * @param  \Throwable  $throwable
+     * @return string
+     */
+    public function render($throwable)
+    {
+        return tap(new Whoops, function ($whoops) {
+            $whoops->appendHandler($this->whoopsHandler());
+
+            $whoops->writeToOutput(false);
+
+            $whoops->allowQuit(false);
+        })->handleException($throwable);
+    }
+
+    /**
+     * Get the Whoops handler for the application.
+     *
+     * @return \Whoops\Handler\Handler
+     */
+    protected function whoopsHandler()
+    {
+        return (new WhoopsHandler)->forDebug();
+    }
+}

src/Illuminate/Foundation/Exceptions/WhoopsHandler.php renamed to src/Illuminate/Foundation/Exceptions/Whoops/WhoopsHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Foundation\Exceptions;
+namespace Illuminate\Foundation\Exceptions\Whoops;
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
@@ -19,8 +19,8 @@ public function forDebug()
             $handler->handleUnconditionally(true);
 
             $this->registerApplicationPaths($handler)
-                 ->registerBlacklist($handler)
-                 ->registerEditor($handler);
+                ->registerBlacklist($handler)
+                ->registerEditor($handler);
         });
     }