diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-02-12 12:24:30 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-02-12 12:24:30 +0100 |
commit | 9856805540843e32b65e2893ea870b6b2e2ba6d0 (patch) | |
tree | a53f5e1813f6220e70b457d51a256c39db814b27 | |
parent | 0c6845a98f050d0cfe8905d814a33407be53830e (diff) | |
download | wallabag-9856805540843e32b65e2893ea870b6b2e2ba6d0.tar.gz wallabag-9856805540843e32b65e2893ea870b6b2e2ba6d0.tar.zst wallabag-9856805540843e32b65e2893ea870b6b2e2ba6d0.zip |
CS
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 5 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/NewUserType.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index e7fb5ad0..6eb621d8 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller; | |||
5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | use Symfony\Component\HttpFoundation\JsonResponse; | 7 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | use Symfony\Component\HttpFoundation\RedirectResponse; | ||
8 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
9 | use Wallabag\CoreBundle\Entity\Config; | 10 | use Wallabag\CoreBundle\Entity\Config; |
10 | use Wallabag\CoreBundle\Entity\TaggingRule; | 11 | use Wallabag\CoreBundle\Entity\TaggingRule; |
@@ -172,7 +173,7 @@ class ConfigController extends Controller | |||
172 | * | 173 | * |
173 | * @Route("/generate-token", name="generate_token") | 174 | * @Route("/generate-token", name="generate_token") |
174 | * | 175 | * |
175 | * @return JsonResponse | 176 | * @return RedirectResponse|JsonResponse |
176 | */ | 177 | */ |
177 | public function generateTokenAction(Request $request) | 178 | public function generateTokenAction(Request $request) |
178 | { | 179 | { |
@@ -202,7 +203,7 @@ class ConfigController extends Controller | |||
202 | * | 203 | * |
203 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") | 204 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") |
204 | * | 205 | * |
205 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 206 | * @return RedirectResponse |
206 | */ | 207 | */ |
207 | public function deleteTaggingRuleAction(TaggingRule $rule) | 208 | public function deleteTaggingRuleAction(TaggingRule $rule) |
208 | { | 209 | { |
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index d8bde17e..6eb0e63f 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php | |||
@@ -21,7 +21,7 @@ class NewUserType extends AbstractType | |||
21 | ->add('plainPassword', RepeatedType::class, array( | 21 | ->add('plainPassword', RepeatedType::class, array( |
22 | 'type' => PasswordType::class, | 22 | 'type' => PasswordType::class, |
23 | 'invalid_message' => 'The password fields must match', | 23 | 'invalid_message' => 'The password fields must match', |
24 | 'first_options' => array('label' => 'Password'), | 24 | 'first_options' => array('label' => 'Password'), |
25 | 'second_options' => array('label' => 'Repeat new password'), | 25 | 'second_options' => array('label' => 'Repeat new password'), |
26 | 'constraints' => array( | 26 | 'constraints' => array( |
27 | new Constraints\Length(array( | 27 | new Constraints\Length(array( |