From 1625c19da46f1ce45cc2647c6905d67d04f8c1e0 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Thu, 7 Apr 2016 21:56:48 +0000 Subject: [PATCH] revert forcing middleware uniqueness --- src/Illuminate/Routing/Route.php | 4 ++-- tests/Routing/RoutingRouteTest.php | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php index 239291e79a34..9138d8caf07e 100755 --- 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_unique(array_merge( + $this->action['middleware'] = array_merge( (array) Arr::get($this->action, 'middleware', []), $middleware - )); + ); return $this; } diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php index dc435bc15f1a..2a34930e6be5 100644 --- a/tests/Routing/RoutingRouteTest.php +++ b/tests/Routing/RoutingRouteTest.php @@ -575,20 +575,6 @@ 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() { /*