Bring back try/catch for 5.1

barryvdh · barryvdh · commit eaa42a589299 · 2016-01-02T13:53:57.000+01:00
diff --git a/src/Middleware/Debugbar.php b/src/Middleware/Debugbar.php
@@ -1,12 +1,23 @@
 <?php namespace Barryvdh\Debugbar\Middleware;
 
 use Closure;
+use Exception;
+use Illuminate\Http\Request;
 use Barryvdh\Debugbar\LaravelDebugbar;
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Debug\ExceptionHandler;
 
-class Debugbar {
+class Debugbar
+{
+    /**
+     * The App container
+     *
+     * @var Container
+     */
+    protected $container;
 
     /**
-     * The Exception Handler
+     * The DebugBar instance
      *
      * @var LaravelDebugbar
      */
@@ -15,27 +26,58 @@ class Debugbar {
     /**
      * Create a new middleware instance.
      *
+     * @param  Container $container
      * @param  LaravelDebugbar $debugbar
      */
-    public function __construct(LaravelDebugbar $debugbar)
+    public function __construct(Container $container, LaravelDebugbar $debugbar)
     {
+        $this->container = $container;
         $this->debugbar = $debugbar;
     }
 
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param  Request  $request
+     * @param  Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
-        $response = $next($request);
+        try {
+            /** @var \Illuminate\Http\Response $response */
+            $response = $next($request);
+        } catch (Exception $e) {
+            $response = $this->handleException($request, $e);
+        }
 
+        // Modify the response to add the Debugbar
         $this->debugbar->modifyResponse($request, $response);
 
         return $response;
 
     }
+
+    /**
+     * Handle the given exception.
+     *
+     * (Copy from Illuminate\Routing\Pipeline by Taylor Otwell)
+     *
+     * @param $passable
+     * @param  Exception $e
+     * @return mixed
+     * @throws Exception
+     */
+    protected function handleException($passable, Exception $e)
+    {
+        if (! $this->container->bound(ExceptionHandler::class) || ! $passable instanceof Request) {
+            throw $e;
+        }
+
+        $handler = $this->container->make(ExceptionHandler::class);
+
+        $handler->report($e);
+
+        return $handler->render($passable, $e);
+    }
 }
