Merge pull request barryvdh#407 from tjbp/middleware-fix

barryvdh · barryvdh · commit 7a298d48c064 · 2015-12-21T20:04:52.000+01:00
Filters deprecated in favour of middleware
diff --git a/src/DataCollector/IlluminateRouteCollector.php b/src/DataCollector/IlluminateRouteCollector.php
@@ -54,7 +54,7 @@ protected function getRouteInformation($route)
         $result = array(
     	   'uri' => $uri ?: '-',
         );
-        
+
         $result = array_merge($result, $action);
 
 
@@ -73,82 +73,27 @@ protected function getRouteInformation($route)
             $filename = ltrim(str_replace(base_path(), '', $reflector->getFileName()), '/');
             $result['file'] = $filename . ':' . $reflector->getStartLine() . '-' . $reflector->getEndLine();
         }
-		
-		if ($before = $this->getBeforeFilters($route)) {
-		    $result['before'] = $before;
-		}
-		
-		if ($after = $this->getAfterFilters($route)) {
-		    $result['after'] = $after;
+
+		if ($middleware = $this->getMiddleware($route)) {
+		    $result['middleware'] = $middleware;
 		}
-		
-        return $result;
-    }
 
-    /**
-     * Get before filters
-     *
-     * @param  \Illuminate\Routing\Route $route
-     * @return string
-     */
-    protected function getBeforeFilters($route)
-    {
-        $before = array_keys($route->beforeFilters());
 
-        $before = array_unique(array_merge($before, $this->getPatternFilters($route)));
 
-        return implode(', ', $before);
+        return $result;
     }
 
-    /*
-     * The following is copied/modified from the RoutesCommand from Laravel, by Taylor Otwell
-     * https://github.com/laravel/framework/blob/4.1/src/Illuminate/Foundation/Console/RoutesCommand.php
-     *
-     */
-
     /**
-     * Get all of the pattern filters matching the route.
+     * Get middleware
      *
      * @param  \Illuminate\Routing\Route $route
-     * @return array
-     */
-    protected function getPatternFilters($route)
-    {
-        $patterns = array();
-
-        foreach ($route->methods() as $method) {
-            // For each method supported by the route we will need to gather up the patterned
-            // filters for that method. We will then merge these in with the other filters
-            // we have already gathered up then return them back out to these consumers.
-            $inner = $this->getMethodPatterns($route->uri(), $method);
-
-            $patterns = array_merge($patterns, array_keys($inner));
-        }
-
-        return $patterns;
-    }
-
-    /**
-     * Get the pattern filters for a given URI and method.
-     *
-     * @param  string $uri
-     * @param  string $method
-     * @return array
-     */
-    protected function getMethodPatterns($uri, $method)
-    {
-        return $this->router->findPatternFilters(Request::create($uri, $method));
-    }
-
-    /**
-     * Get after filters
-     *
-     * @param  Route $route
      * @return string
      */
-    protected function getAfterFilters($route)
+    protected function getMiddleware($route)
     {
-        return implode(', ', array_keys($route->afterFilters()));
+        $middleware = array_keys($route->middleware());
+
+        return implode(', ', $middleware);
     }
 
     /**
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -141,24 +141,6 @@ function () use ($debugbar, $startTime) {
                       }
                   }
                 );
-
-                //Check if App::before is already called..
-                if ($this->app->isBooted()) {
-                    $debugbar->startMeasure('application', 'Application');
-                } else {
-                    $this->app['router']->before(
-                      function () use ($debugbar) {
-                          $debugbar->startMeasure('application', 'Application');
-                      }
-                    );
-                }
-
-                $this->app['router']->after(
-                  function () use ($debugbar) {
-                      $debugbar->stopMeasure('application');
-                      $debugbar->startMeasure('after', 'After application');
-                  }
-                );
             }
 
         }
diff --git a/src/Middleware/Debugbar.php b/src/Middleware/Debugbar.php
@@ -44,6 +44,8 @@ public function handle($request, Closure $next)
         /** @var \Barryvdh\Debugbar\LaravelDebugbar $debugbar */
         $debugbar = $this->app['debugbar'];
 
+        $debugbar->startMeasure('application', 'Application');
+
         try {
             /** @var \Illuminate\Http\Response $response */
             $response = $next($request);
@@ -54,6 +56,9 @@ public function handle($request, Closure $next)
             $response = $this->exceptionHandler->render($request, $e);
         }
 
+        $debugbar->stopMeasure('application');
+        $debugbar->startMeasure('after', 'After application');
+
         return $debugbar->modifyResponse($request, $response);
 
     }

Original file line number	Diff line number	Diff line change
`@@ -141,24 +141,6 @@ function () use ($debugbar, $startTime) {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`);`
`144`		`-`
`145`		`- //Check if App::before is already called..`
`146`		`- if ($this->app->isBooted()) {`
`147`		`- $debugbar->startMeasure('application', 'Application');`
`148`		`- } else {`
`149`		`- $this->app['router']->before(`
`150`		`- function () use ($debugbar) {`
`151`		`- $debugbar->startMeasure('application', 'Application');`
`152`		`- }`
`153`		`- );`
`154`		`- }`
`155`		`-`
`156`		`- $this->app['router']->after(`
`157`		`- function () use ($debugbar) {`
`158`		`- $debugbar->stopMeasure('application');`
`159`		`- $debugbar->startMeasure('after', 'After application');`
`160`		`- }`
`161`		`- );`
`162`	`144`	`}`
`163`	`145`
`164`	`146`	`}`