Proper parameter name, simplify logic & phpdoc

diff --git a/app/config/config.yml b/app/config/config.yml
index cad51e6cb94d6ad8ae48be193c6906cdd624e485..30fd60636376415c91c0da22cfa638090cf2ac8e 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -51,7 +51,7 @@ wallabag_core:
     reading_speed: 1
 
 wallabag_user:
-    registration_enabled: "%registration_enabled%"
+    registration_enabled: "%fosuser_registration%"
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']

diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php
index bba27cfb1bab56719c3a549c37eb16f8e347c02f..d6d0fda1a5a4146c8c1b4bf6f96f5817cae80f9b 100644 (file)
--- 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 a5f9376345dfc8d2fb64bccaf0053bbcb2854d19..1e752b6d3c10ac5f62f4a09ed3758908982d8f3c 100644 (file)
--- 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)