formatting and fixes

Author: taylorotwell

src/Illuminate/Routing/Route.php

@@ -932,42 +932,44 @@ public function middleware($middleware = null)
     }
 
     /**
-     * Set which middleware(s) to skip.
+     * Get the middleware for the route's controller.
      *
-     * @param  array|string|null $middleware
-     * @return $this|array
+     * @return array
      */
-    public function skipMiddleware($middleware = null)
+    public function controllerMiddleware()
     {
-        if (is_null($middleware)) {
-            return (array) ($this->action['skip_middleware'] ?? []);
+        if (! $this->isControllerAction()) {
+            return [];
         }
 
-        if (is_string($middleware)) {
-            $middleware = func_get_args();
-        }
+        return $this->controllerDispatcher()->getMiddleware(
+            $this->getController(), $this->getControllerMethod()
+        );
+    }
 
-        $this->action['skip_middleware'] = array_merge(
-            (array) ($this->action['skip_middleware'] ?? []), $middleware
+    /**
+     * Specify middleware that should be removed from the given route.
+     *
+     * @param  array|string  $middleware
+     * @return $this|array
+     */
+    public function withoutMiddleware($middleware)
+    {
+        $this->action['excluded_middleware'] = array_merge(
+            (array) ($this->action['excluded_middleware'] ?? []), Arr::wrap($middleware)
         );
 
         return $this;
     }
 
     /**
-     * Get the middleware for the route's controller.
+     * Get the middleware should be removed from the route.
      *
      * @return array
      */
-    public function controllerMiddleware()
+    public function excludedMiddleware()
     {
-        if (! $this->isControllerAction()) {
-            return [];
-        }
-
-        return $this->controllerDispatcher()->getMiddleware(
-            $this->getController(), $this->getControllerMethod()
-        );
+        return (array) ($this->action['excluded_middleware'] ?? []);
     }
 
     /**

src/Illuminate/Routing/Router.php

@@ -695,11 +695,15 @@ protected function runRouteWithinStack(Route $route, Request $request)
      */
     public function gatherRouteMiddleware(Route $route)
     {
+        $excluded = collect($route->excludedMiddleware())->map(function ($name) {
+            return (array) MiddlewareNameResolver::resolve($name, $this->middleware, $this->middlewareGroups);
+        })->flatten()->values()->all();
+
         $middleware = collect($route->gatherMiddleware())->map(function ($name) {
             return (array) MiddlewareNameResolver::resolve($name, $this->middleware, $this->middlewareGroups);
-        })->flatten()->reject(function ($name) use ($route) {
-            return in_array($name, $route->skipMiddleware(), true);
-        });
+        })->flatten()->reject(function ($name) use ($route, $excluded) {
+            return in_array($name, $excluded, true);
+        })->values();
 
         return $this->sortMiddleware($middleware);
     }

tests/Routing/RouteRegistrarTest.php

@@ -60,15 +60,15 @@ public function testMiddlewareFluentRegistration()
         $this->assertEquals(['seven'], $this->getRoute()->middleware());
     }
 
-    public function testSkipMiddlewareRegistration()
+    public function testWithoutMiddlewareRegistration()
     {
         $this->router->middleware(['one', 'two'])->get('users', function () {
             return 'all-users';
-        })->skipMiddleware('one');
+        })->withoutMiddleware('one');
 
         $this->seeResponse('all-users', Request::create('users', 'GET'));
 
-        $this->assertEquals(['one'], $this->getRoute()->skipMiddleware());
+        $this->assertEquals(['one'], $this->getRoute()->excludedMiddleware());
     }
 
     public function testCanRegisterGetRouteWithClosureAction()

tests/Routing/RoutingRouteTest.php

@@ -200,7 +200,7 @@ public function testMiddlewareCanBeSkipped()
 
         $router->get('foo/bar', ['middleware' => 'web', function () {
             return 'hello';
-        }])->skipMiddleware(RoutingTestMiddlewareGroupTwo::class);
+        }])->withoutMiddleware(RoutingTestMiddlewareGroupTwo::class);
 
         $this->assertEquals('hello', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
     }