Merge pull request #5036 from aramalipoor/patch-3

[ResourceBundle] Pass $resource in redirectToIndex parameters
Sylius · May 16, 2016 · 5443bea · 5443bea
2 parents 9873639 + 88d2488
commit 5443bea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Sylius/Bundle/ResourceBundle/Controller/RedirectHandler.php b/src/Sylius/Bundle/ResourceBundle/Controller/RedirectHandler.php
@@ -62,7 +62,7 @@ public function redirectToIndex(RequestConfiguration $configuration, ResourceInt
         return $this->redirectToRoute(
             $configuration,
             $configuration->getRedirectRoute('index'),
-            $configuration->getRedirectParameters()
+            $configuration->getRedirectParameters($resource)
         );
     }
 

diff --git a/src/Sylius/Bundle/ResourceBundle/spec/Controller/RedirectHandlerSpec.php b/src/Sylius/Bundle/ResourceBundle/spec/Controller/RedirectHandlerSpec.php
@@ -88,17 +88,20 @@ function it_fallbacks_to_index_route_if_show_does_not_exist(
         $this->redirectToResource($configuration, $resource)->shouldHaveType(RedirectResponse::class);
     }
 
-    function it_redirects_to_index(RequestConfiguration $configuration, $router)
-    {
+    function it_redirects_to_index(
+        RequestConfiguration $configuration,
+        ResourceInterface $resource,
+        RouterInterface $router
+    ) {
         $configuration->getRedirectRoute('index')->willReturn('my_route');
-        $configuration->getRedirectParameters()->willReturn([]);
+        $configuration->getRedirectParameters($resource)->willReturn([]);
 
         $router->generate('my_route', [])->willReturn('http://myurl.com');
 
         $configuration->getRedirectHash()->willReturn(null);
         $configuration->isHeaderRedirection()->willReturn(false);
 
-        $this->redirectToIndex($configuration)->shouldHaveType(RedirectResponse::class);
+        $this->redirectToIndex($configuration, $resource)->shouldHaveType(RedirectResponse::class);
     }
 
     function it_redirects_to_route(RequestConfiguration $configuration, $router)