Fix login/logout redirect method

ZF-Commons · Jun 8, 2014 · 206ead0 · 206ead0 · kusmierz · Jun 23, 2014
1 parent db5b39d
commit 206ead0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ZfcUser/Controller/UserController.php b/src/ZfcUser/Controller/UserController.php
@@ -118,7 +118,7 @@ public function logoutAction()
         $redirect = $this->params()->fromPost('redirect', $this->params()->fromQuery('redirect', false));
 
         if ($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
-            return $this->redirect()->toUrl($redirect);
+            return $this->redirect()->toRoute($redirect);
         }
 
         return $this->redirect()->toRoute($this->getOptions()->getLogoutRedirectRoute());
@@ -155,7 +155,7 @@ public function authenticateAction()
         }
 
         if ($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
-            return $this->redirect()->toUrl($redirect);
+            return $this->redirect()->toRoute($redirect);
         }
 
         return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());

diff --git a/tests/ZfcUserTest/Controller/UserControllerTest.php b/tests/ZfcUserTest/Controller/UserControllerTest.php
@@ -391,7 +391,7 @@ public function testLogoutAction($withRedirect, $post, $query)
                           ->method('getUseRedirectParameterIfPresent')
                           ->will($this->returnValue((bool) $withRedirect));
             $redirect->expects($this->any())
-                     ->method('toUrl')
+                     ->method('toRoute')
                      ->with($expectedLocation)
                      ->will($this->returnValue($response));
         } else {
@@ -510,7 +510,7 @@ public function testAuthenticateAction($wantRedirect, $post, $query, $prepareRes
 
             } elseif ($wantRedirect && $hasRedirect) {
                 $redirect->expects($this->once())
-                         ->method('toUrl')
+                         ->method('toRoute')
                          ->with(($post ?: $query ?: false))
                          ->will($this->returnValue($response));
             } else {