Merge pull request #12911 from themsaid/unique-middlewares

[5.2] Apply a middleware only once
laravel · Mar 29, 2016 · 54bbfb5 · 54bbfb5
2 parents 54d6ff4 + 185447c
commit 54bbfb5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -242,9 +242,9 @@ public function middleware($middleware = null)
             $middleware = [$middleware];
         }
 
-        $this->action['middleware'] = array_merge(
+        $this->action['middleware'] = array_unique(array_merge(
             (array) Arr::get($this->action, 'middleware', []), $middleware
-        );
+        ));
 
         return $this;
     }

diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -575,6 +575,20 @@ public function testRouteMiddlewareMergeWithMiddlewareAttributesAsStrings()
         );
     }
 
+    public function testRouteMiddlewareAppliedOnlyOnce()
+    {
+        $router = $this->getRouter();
+        $router->group(['middleware' => 'foo'], function () use ($router) {
+            $router->get('bar', function () { return 'hello'; })->middleware(['foo', 'foo']);
+        });
+        $routes = $router->getRoutes()->getRoutes();
+        $route = $routes[0];
+        $this->assertEquals(
+            ['foo'],
+            $route->middleware()
+        );
+    }
+
     public function testRoutePrefixing()
     {
         /*