Merge branch 'terminable-route-middlewares-l5' of https://github.com/winglian/framework into winglian-terminable-route-middlewares-l5

taylorotwell · taylorotwell · commit 834664f53aa7 · 2015-02-23T15:29:09.000-06:00
diff --git a/src/Illuminate/Foundation/Http/Kernel.php b/src/Illuminate/Foundation/Http/Kernel.php
@@ -120,7 +120,10 @@ protected function sendRequestThroughRouter($request)
 	 */
 	public function terminate($request, $response)
 	{
-		foreach ($this->middleware as $middleware)
+		$routeResolver = $request->getRouteResolver();
+		$routeMiddlewares = $this->router->gatherRouteMiddlewares($routeResolver());
+
+		foreach (array_merge($routeMiddlewares, $this->middleware) as $middleware)
 		{
 			$instance = $this->app->make($middleware);
 
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -699,7 +699,7 @@ protected function runRouteWithinStack(Route $route, Request $request)
 	 * @param  \Illuminate\Routing\Route  $route
 	 * @return array
 	 */
-	protected function gatherRouteMiddlewares(Route $route)
+	public function gatherRouteMiddlewares(Route $route)
 	{
 		return Collection::make($route->middleware())->map(function($m)
 		{

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,10 @@ protected function sendRequestThroughRouter($request)`
`120`	`120`	`*/`
`121`	`121`	`public function terminate($request, $response)`
`122`	`122`	`{`
`123`		`- foreach ($this->middleware as $middleware)`
	`123`	`+ $routeResolver = $request->getRouteResolver();`
	`124`	`+ $routeMiddlewares = $this->router->gatherRouteMiddlewares($routeResolver());`
	`125`	`+`
	`126`	`+ foreach (array_merge($routeMiddlewares, $this->middleware) as $middleware)`
`124`	`127`	`{`
`125`	`128`	`$instance = $this->app->make($middleware);`
`126`	`129`
Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ protected function runRouteWithinStack(Route $route, Request $request)`
`699`	`699`	`* @param \Illuminate\Routing\Route $route`
`700`	`700`	`* @return array`
`701`	`701`	`*/`
`702`		`- protected function gatherRouteMiddlewares(Route $route)`
	`702`	`+ public function gatherRouteMiddlewares(Route $route)`
`703`	`703`	`{`
`704`	`704`	`return Collection::make($route->middleware())->map(function($m)`
`705`	`705`	`{`