Added constants for redirection values

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index c40d1535f1a62cb013e08e7ece264ed657a3a08f..bfc2fff87c070fdddb5c79c647c219eea4cb9d79 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -16,6 +16,9 @@ use Wallabag\UserBundle\Entity\User;
  */
 class Config
 {
+    const REDIRECT_TO_HOMEPAGE = 0;
+    const REDIRECT_TO_CURRENT_PAGE = 1;
+
     /**
      * @var int
      *

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 3b1a8026979eb878358f57ded695e262e2cb7725..7e3b9dd4f93ce52c0ba523605b03b0f86aef0c0f 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Wallabag\CoreBundle\Entity\Config;
 
 class ConfigType extends AbstractType
 {
@@ -51,8 +52,8 @@ class ConfigType extends AbstractType
             ->add('action_mark_as_read', ChoiceType::class, [
                 'label' => 'config.form_settings.action_mark_as_read.label',
                 'choices' => [
-                    'config.form_settings.action_mark_as_read.redirect_homepage' => '0',
-                    'config.form_settings.action_mark_as_read.redirect_current_page' => '1',
+                    'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
+                    'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
                 ],
             ])
             ->add('language', ChoiceType::class, [

diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Wallabag/CoreBundle/Helper/Redirect.php
index 918d926616a517fa26b2e1d9c02cdcad709cf3a7..59172db40110d628a223a750af6a88fc718ded36 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/Redirect.php
+++ b/src/Wallabag/CoreBundle/Helper/Redirect.php
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Helper;
 
 use Symfony\Component\Routing\Router;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Wallabag\CoreBundle\Entity\Config;
 
 /**
  * Manage redirections to avoid redirecting to empty routes.
@@ -27,7 +28,7 @@ class Redirect
      */
     public function to($url, $fallback = '')
     {
-        if ($this->actionMarkAsRead == 0) {
+        if (Config::REDIRECT_TO_HOMEPAGE === $this->actionMarkAsRead) {
             return $this->router->generate('homepage');
         }