From 9856805540843e32b65e2893ea870b6b2e2ba6d0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 12 Feb 2016 12:24:30 +0100 Subject: CS --- src/Wallabag/CoreBundle/Controller/ConfigController.php | 5 +++-- src/Wallabag/CoreBundle/Form/Type/NewUserType.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle') 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; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\TaggingRule; @@ -172,7 +173,7 @@ class ConfigController extends Controller * * @Route("/generate-token", name="generate_token") * - * @return JsonResponse + * @return RedirectResponse|JsonResponse */ public function generateTokenAction(Request $request) { @@ -202,7 +203,7 @@ class ConfigController extends Controller * * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") * - * @return \Symfony\Component\HttpFoundation\RedirectResponse + * @return RedirectResponse */ public function deleteTaggingRuleAction(TaggingRule $rule) { 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 ->add('plainPassword', RepeatedType::class, array( 'type' => PasswordType::class, 'invalid_message' => 'The password fields must match', - 'first_options' => array('label' => 'Password'), + 'first_options' => array('label' => 'Password'), 'second_options' => array('label' => 'Repeat new password'), 'constraints' => array( new Constraints\Length(array( -- cgit v1.2.3