X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=4f75511bf62cf5c7ee23b5ceb5eaeeb16a89248f;hb=114c55c0a6eade2ba6c53fe25f61cc58cca91620;hp=779be2689897a3344a279f4b667acbc03b0cffbe;hpb=439b36323e37f669b056cc5228c44bb91196256c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 779be268..4f75511b 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -32,7 +32,7 @@ class ConfigController extends Controller
         $user = $this->getUser();
 
         // handle basic config detail (this form is defined as a service)
-        $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
+        $configForm = $this->createForm(ConfigType::class, $config, ['action' => $this->generateUrl('config')]);
         $configForm->handleRequest($request);
 
         if ($configForm->isValid()) {
@@ -52,7 +52,7 @@ class ConfigController extends Controller
         }
 
         // handle changing password
-        $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
+        $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config').'#set4']);
         $pwdForm->handleRequest($request);
 
         if ($pwdForm->isValid()) {
@@ -71,10 +71,10 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(UserInformationType::class, $user, array(
-            'validation_groups' => array('Profile'),
+        $userForm = $this->createForm(UserInformationType::class, $user, [
+            'validation_groups' => ['Profile'],
             'action' => $this->generateUrl('config').'#set3',
-        ));
+        ]);
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
@@ -89,7 +89,7 @@ class ConfigController extends Controller
         }
 
         // handle rss information
-        $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
+        $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config').'#set2']);
         $rssForm->handleRequest($request);
 
         if ($rssForm->isValid()) {
@@ -106,7 +106,7 @@ class ConfigController extends Controller
 
         // handle tagging rule
         $taggingRule = new TaggingRule();
-        $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
+        $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $this->generateUrl('config').'#set5']);
         $newTaggingRule->handleRequest($request);
 
         if ($newTaggingRule->isValid()) {
@@ -126,10 +126,10 @@ class ConfigController extends Controller
         $newUser = $userManager->createUser();
         // enable created user by default
         $newUser->setEnabled(true);
-        $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
-            'validation_groups' => array('Profile'),
+        $newUserForm = $this->createForm(NewUserType::class, $newUser, [
+            'validation_groups' => ['Profile'],
             'action' => $this->generateUrl('config').'#set6',
-        ));
+        ]);
         $newUserForm->handleRequest($request);
 
         if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) {
@@ -140,6 +140,7 @@ class ConfigController extends Controller
             $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
             $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
             $config->setLanguage($this->getParameter('wallabag_core.language'));
+            $config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed'));
 
             $em->persist($config);
 
@@ -147,27 +148,27 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                $this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername()))
+                $this->get('translator')->trans('flashes.config.notice.user_added', ['%username%' => $newUser->getUsername()])
             );
 
             return $this->redirect($this->generateUrl('config').'#set6');
         }
 
-        return $this->render('WallabagCoreBundle:Config:index.html.twig', array(
-            'form' => array(
+        return $this->render('WallabagCoreBundle:Config:index.html.twig', [
+            'form' => [
                 'config' => $configForm->createView(),
                 'rss' => $rssForm->createView(),
                 'pwd' => $pwdForm->createView(),
                 'user' => $userForm->createView(),
                 'new_user' => $newUserForm->createView(),
                 'new_tagging_rule' => $newTaggingRule->createView(),
-            ),
-            'rss' => array(
+            ],
+            'rss' => [
                 'username' => $user->getUsername(),
                 'token' => $config->getRssToken(),
-            ),
+            ],
             'twofactor_auth' => $this->getParameter('twofactor_auth'),
-        ));
+        ]);
     }
 
     /**
@@ -187,7 +188,7 @@ class ConfigController extends Controller
         $em->flush();
 
         if ($request->isXmlHttpRequest()) {
-            return new JsonResponse(array('token' => $config->getRssToken()));
+            return new JsonResponse(['token' => $config->getRssToken()]);
         }
 
         $this->get('session')->getFlashBag()->add(
@@ -229,7 +230,7 @@ class ConfigController extends Controller
      * Retrieve config for the current user.
      * If no config were found, create a new one.
      *
-     * @return Wallabag\CoreBundle\Entity\Config
+     * @return Config
      */
     private function getConfig()
     {