From 88ab64c4e0479e85a990560f77eed35c28648a12 Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo Date: Fri, 13 Feb 2015 21:02:55 -0500 Subject: [PATCH 1/4] Return response to routeMiddleware too --- src/Illuminate/Routing/Router.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php index bf3c6ca4d6f5..a38d00fce0ad 100755 --- a/src/Illuminate/Routing/Router.php +++ b/src/Illuminate/Routing/Router.php @@ -248,7 +248,7 @@ public function controller($uri, $controller, $names = array()) } $routable = (new ControllerInspector) - ->getRoutable($prepended, $uri); + ->getRoutable($prepended, $uri); // When a controller is routed using this method, we use Reflection to parse // out all of the routable methods for the controller, then register each @@ -660,8 +660,6 @@ public function dispatchToRoute(Request $request) ); } - $response = $this->prepareResponse($request, $response); - // After we have a prepared response from the route or filter we will call to // the "after" filters to do any last minute processing on this request or // response object before the response is returned back to the consumer. @@ -682,11 +680,14 @@ protected function runRouteWithinStack(Route $route, Request $request) $middleware = $this->gatherRouteMiddlewares($route); return (new Pipeline($this->container)) - ->send($request) - ->through($middleware) - ->then(function($request) use ($route) + ->send($request) + ->through($middleware) + ->then(function($request) use ($route) { - return $route->run($request); + return $this->prepareResponse( + $request, + $route->run($request) + ); }); } From 707602a98622bd9f78871cf20622d374eea4be1d Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo Date: Fri, 13 Feb 2015 21:04:31 -0500 Subject: [PATCH 2/4] Fix spacing --- src/Illuminate/Routing/Router.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php index a38d00fce0ad..8967da3eed22 100755 --- a/src/Illuminate/Routing/Router.php +++ b/src/Illuminate/Routing/Router.php @@ -247,8 +247,7 @@ public function controller($uri, $controller, $names = array()) $prepended = $this->prependGroupUses($controller); } - $routable = (new ControllerInspector) - ->getRoutable($prepended, $uri); + $routable = (new ControllerInspector)->getRoutable($prepended, $uri); // When a controller is routed using this method, we use Reflection to parse // out all of the routable methods for the controller, then register each From 06d4003fc4b244a76236b1f34c5b017d9b9f90fe Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo Date: Fri, 13 Feb 2015 21:08:46 -0500 Subject: [PATCH 3/4] Add prepareResponse back --- src/Illuminate/Routing/Router.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php index 8967da3eed22..bec37eb688c7 100755 --- a/src/Illuminate/Routing/Router.php +++ b/src/Illuminate/Routing/Router.php @@ -659,6 +659,8 @@ public function dispatchToRoute(Request $request) ); } + $response = $this->prepareResponse($request, $response); + // After we have a prepared response from the route or filter we will call to // the "after" filters to do any last minute processing on this request or // response object before the response is returned back to the consumer. From 80e96f394006dd55291a3de673ae96c0cc1778ea Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo Date: Sat, 14 Feb 2015 14:29:59 -0500 Subject: [PATCH 4/4] Revert indentation --- src/Illuminate/Routing/Router.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php index bec37eb688c7..ba13b85c23be 100755 --- a/src/Illuminate/Routing/Router.php +++ b/src/Illuminate/Routing/Router.php @@ -247,7 +247,8 @@ public function controller($uri, $controller, $names = array()) $prepended = $this->prependGroupUses($controller); } - $routable = (new ControllerInspector)->getRoutable($prepended, $uri); + $routable = (new ControllerInspector) + ->getRoutable($prepended, $uri); // When a controller is routed using this method, we use Reflection to parse // out all of the routable methods for the controller, then register each @@ -681,9 +682,9 @@ protected function runRouteWithinStack(Route $route, Request $request) $middleware = $this->gatherRouteMiddlewares($route); return (new Pipeline($this->container)) - ->send($request) - ->through($middleware) - ->then(function($request) use ($route) + ->send($request) + ->through($middleware) + ->then(function($request) use ($route) { return $this->prepareResponse( $request,