From 4086e0782e4545bd3572f929b4476b200588f6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 15 Apr 2016 09:58:29 +0200 Subject: Fix tests --- src/Wallabag/CoreBundle/Helper/Redirect.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/Wallabag/CoreBundle/Helper') 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; } } -- cgit v1.2.3