Merge pull request #2816 from l0gicgate/FixRedirectBug

4.x - Fix RouteCollectorProxy::redirect() Bug
slimphp · Aug 20, 2019 · 89f8076 · 89f8076
2 parents 806adf2 + 5128833
commit 89f8076
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/Slim/Routing/RouteCollectorProxy.php b/Slim/Routing/RouteCollectorProxy.php
@@ -195,8 +195,10 @@ public function group(string $pattern, $callable): RouteGroupInterface
      */
     public function redirect(string $from, $to, int $status = 302): RouteInterface
     {
-        $handler = function () use ($to, $status) {
-            $response = $this->responseFactory->createResponse($status);
+        $responseFactory = $this->responseFactory;
+
+        $handler = function () use ($to, $status, $responseFactory) {
+            $response = $responseFactory->createResponse($status);
             return $response->withHeader('Location', (string) $to);
         };
 

diff --git a/tests/Routing/RouteCollectorProxyTest.php b/tests/Routing/RouteCollectorProxyTest.php
@@ -12,6 +12,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
+use Slim\CallableResolver;
 use Slim\Interfaces\CallableResolverInterface;
 use Slim\Interfaces\RouteCollectorInterface;
 use Slim\Interfaces\RouteGroupInterface;
@@ -384,9 +385,8 @@ public function testMap()
 
     public function testRedirect()
     {
-
-        $callableResolverProphecy = $this->prophesize(CallableResolverInterface::class);
         $containerProphecy = $this->prophesize(ContainerInterface::class);
+        $callableResolver = new CallableResolver($containerProphecy->reveal());
 
         $from = '/from';
         $to = '/to';
@@ -399,27 +399,33 @@ public function testRedirect()
 
         $responseFactoryProphecy = $this->prophesize(ResponseFactoryInterface::class);
         $responseFactoryProphecy
-            ->createResponse(302)
-            ->willReturn($responseProphecy->reveal())
+            ->createResponse()
+            ->will(function () use ($responseProphecy) {
+                $this
+                    ->createResponse(302)
+                    ->willReturn($responseProphecy)
+                    ->shouldBeCalledOnce();
+                return $responseProphecy->reveal();
+            })
             ->shouldBeCalledOnce();
 
         $routeCollector = new RouteCollector(
             $responseFactoryProphecy->reveal(),
-            $callableResolverProphecy->reveal()
+            $callableResolver
         );
 
         $routeCollectorProxy = new RouteCollectorProxy(
             $responseFactoryProphecy->reveal(),
-            $callableResolverProphecy->reveal(),
-            null,
+            $callableResolver,
+            $containerProphecy->reveal(),
             $routeCollector
         );
 
         $route = $routeCollectorProxy->redirect($from, $to);
-        $routeCallable = $route->getCallable();
-        $routeCallable();
+        $request = $this->createServerRequest('/');
+        $response = $route->run($request);
 
-        $this->assertEquals($from, $route->getPattern());
+        $this->assertSame($responseProphecy->reveal(), $response);
     }
 
     public function testGroup()