fixed terminable middlewares assigned to the controller

laravel · Mar 28, 2016 · 84eb430 · 84eb430 · johnboy-leeds · May 4, 2016
1 parent 2bf0851
commit 84eb430
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Illuminate/Routing/ControllerDispatcher.php b/src/Illuminate/Routing/ControllerDispatcher.php
@@ -103,7 +103,7 @@ protected function callWithinStack($instance, $route, $request, $method)
      * @param  string  $method
      * @return array
      */
-    protected function getMiddleware($instance, $method)
+    public function getMiddleware($instance, $method)
     {
         $results = new Collection;
 

diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -235,7 +235,18 @@ protected function extractOptionalParameters()
     public function middleware($middleware = null)
     {
         if (is_null($middleware)) {
-            return (array) Arr::get($this->action, 'middleware', []);
+            $middlewares = (array) Arr::get($this->action, 'middleware', []);
+
+            if (is_string($this->action['uses'])) {
+                list($class, $method) = explode('@', $this->action['uses']);
+                $controller = $this->container->make($class);
+
+                $controllerMiddlewares = (new ControllerDispatcher($this->router, $this->container))
+                    ->getMiddleware($controller, $method);
+                $middlewares = array_merge($middlewares, $controllerMiddlewares);
+            }
+
+            return $middlewares;
         }
 
         if (is_string($middleware)) {