From 7149aa57814a9d6151f4fe049126e3cb5d86a254 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 24 Jul 2016 11:41:04 +0200 Subject: Proper parameter name, simplify logic & phpdoc --- src/Wallabag/UserBundle/Controller/RegistrationController.php | 8 +++----- src/Wallabag/UserBundle/Controller/SecurityController.php | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php index bba27cfb..d6d0fda1 100644 --- a/src/Wallabag/UserBundle/Controller/RegistrationController.php +++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php @@ -10,11 +10,9 @@ class RegistrationController extends FOSRegistrationController public function registerAction(Request $request) { if ($this->container->getParameter('wallabag_user.registration_enabled')) { - parent::registerAction($request); - } - else - { - return $this->redirectToRoute('fos_user_security_login', array(), 301); + return parent::registerAction($request); } + + return $this->redirectToRoute('fos_user_security_login', array(), 301); } } diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php index a5f93763..1e752b6d 100644 --- a/src/Wallabag/UserBundle/Controller/SecurityController.php +++ b/src/Wallabag/UserBundle/Controller/SecurityController.php @@ -4,6 +4,9 @@ namespace Wallabag\UserBundle\Controller; use FOS\UserBundle\Controller\SecurityController as FOSSecurityController; +/** + * Extends login form in order to pass the registration_enabled parameter. + */ class SecurityController extends FOSSecurityController { protected function renderLogin(array $data) -- cgit v1.2.3