2 files changed, 18 insertions, 11 deletions

diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Wallabag/CoreBundle/Helper/Redirect.php
index 0921c3f9..c14c79d1 100644
--- a/src/Wallabag/CoreBundle/Helper/Redirect.php
+++ b/src/Wallabag/CoreBundle/Helper/Redirect.php
@@ -4,6 +4,9 @@ namespace Wallabag\CoreBundle\Helper;
 
 use Symfony\Component\Routing\Router;
 
+/**
+ * Manage redirections to avoid redirecting to empty routes.
+ */
 class Redirect
 {
     private $router;
@@ -21,16 +24,14 @@ class Redirect
      */
     public function to($url, $fallback = '')
     {
-        $returnUrl = $url;
+        if (null !== $url) {
+            return $url;
+        }
 
-        if (null === $url) {
-            if ('' !== $fallback) {
-                $returnUrl = $fallback;
-            } else {
-                $returnUrl = $this->router->generate('homepage');
-            }
+        if ('' === $fallback) {
+            return $this->router->generate('homepage');
         }
 
-        return $returnUrl;
+        return $fallback;
     }
 }
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php b/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
index da19cf58..f4aecc80 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
@@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Helper\Redirect;
 
 class RedirectTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Symfony\Component\Routing\Router */
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $routerMock;
 
     /** @var Redirect */
@@ -41,9 +41,15 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
 
     private function getRouterMock()
     {
-        return $this->getMockBuilder('Symfony\Component\Routing\Router')
-            ->setMethods(['generate'])
+        $mock = $this->getMockBuilder('Symfony\Component\Routing\Router')
             ->disableOriginalConstructor()
             ->getMock();
+
+        $mock->expects($this->any())
+            ->method('generate')
+            ->with('homepage')
+            ->willReturn('homepage');
+
+        return $mock;
     }
 }