Add a getter for the middleware that merges controller middleware.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Console/Command/Routes.php

@@ -96,9 +96,9 @@ protected function getRoutes()
      */
     protected function routeHasAuthMiddleware($route)
     {
-        $middleware = $route->getAction()['middleware'];
+        $middleware = $route->getMiddleware();
 
-        return array_search('api.auth', $middleware) !== false;
+        return isset($middleware['api.auth']);
     }
 
     /**

src/Routing/Route.php

@@ -114,6 +114,13 @@ class Route
      */
     protected $conditionalRequest = true;
 
+    /**
+     * Middleware applied to route.
+     *
+     * @var array
+     */
+    protected $middleware;
+
     /**
      * Create a new route instance.
      *
@@ -238,15 +245,41 @@ public function getController()
     {
         if (! isset($this->action['uses']) || ! is_string($this->action['uses'])) {
             return;
+        } elseif (isset($this->controller)) {
+            return $this->controller;
         }
 
         if (str_contains($this->action['uses'], '@')) {
             list($controller, $this->method) = explode('@', $this->action['uses']);
 
-            $this->controller = $this->container->make($controller);
+            return $this->controller = $this->container->make($controller);
+        }
+    }
+
+    /**
+     * Get the middleware applied to the route.
+     *
+     * @return array
+     */
+    public function getMiddleware()
+    {
+        if (! is_null($this->middleware)) {
+            return $this->middleware;
+        }
+
+        $this->middleware = [];
+
+        foreach ($this->action['middleware'] as $middleware) {
+            list ($middleware, $options) = array_merge(explode(':', $middleware), [[]]);
+
+            $this->middleware[$middleware] = $options;
+        }
+
+        if ($controller = $this->getController()) {
+            $this->middleware = array_merge($this->middleware, $controller->getMiddleware());
         }
 
-        return $this->controller;
+        return $this->middleware;
     }
 
     /**