aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Helper
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-04-15 09:58:29 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-04-15 09:58:29 +0200
commit4086e0782e4545bd3572f929b4476b200588f6c0 (patch)
treef7f58dcfa4d6f3a0c0be67700322c8821341cea4 /src/Wallabag/CoreBundle/Helper
parentaf497a641c2a46c99bbc67215e041a46c91695bc (diff)
downloadwallabag-4086e0782e4545bd3572f929b4476b200588f6c0.tar.gz
wallabag-4086e0782e4545bd3572f929b4476b200588f6c0.tar.zst
wallabag-4086e0782e4545bd3572f929b4476b200588f6c0.zip
Fix tests
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper')
-rw-r--r--src/Wallabag/CoreBundle/Helper/Redirect.php17
1 files changed, 9 insertions, 8 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;
4 4
5use Symfony\Component\Routing\Router; 5use Symfony\Component\Routing\Router;
6 6
7/**
8 * Manage redirections to avoid redirecting to empty routes.
9 */
7class Redirect 10class Redirect
8{ 11{
9 private $router; 12 private $router;
@@ -21,16 +24,14 @@ class Redirect
21 */ 24 */
22 public function to($url, $fallback = '') 25 public function to($url, $fallback = '')
23 { 26 {
24 $returnUrl = $url; 27 if (null !== $url) {
28 return $url;
29 }
25 30
26 if (null === $url) { 31 if ('' === $fallback) {
27 if ('' !== $fallback) { 32 return $this->router->generate('homepage');
28 $returnUrl = $fallback;
29 } else {
30 $returnUrl = $this->router->generate('homepage');
31 }
32 } 33 }
33 34
34 return $returnUrl; 35 return $fallback;
35 } 36 }
36} 37}