Merge pull request laravel#7487 from winglian/routemiddlewares-l5

taylorotwell · taylorotwell · commit bfa96f56af79 · 2015-02-23T11:34:58.000-06:00
[5.0] Allow route middlewares to be grouped together
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -703,9 +703,9 @@ protected function gatherRouteMiddlewares(Route $route)
 	{
 		return Collection::make($route->middleware())->map(function($m)
 		{
-			return array_get($this->middleware, $m, $m);
+			return Collection::make(array_get($this->middleware, $m, $m));
 
-		})->all();
+		})->collapse()->all();
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -703,9 +703,9 @@ protected function gatherRouteMiddlewares(Route $route)`
`703`	`703`	`{`
`704`	`704`	`return Collection::make($route->middleware())->map(function($m)`
`705`	`705`	`{`
`706`		`- return array_get($this->middleware, $m, $m);`
	`706`	`+ return Collection::make(array_get($this->middleware, $m, $m));`
`707`	`707`
`708`		`- })->all();`
	`708`	`+ })->collapse()->all();`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`/**`