removing variables that are only used once + fixing 2 bugs with

container

Author: weaverryan

Controller/GroupController.php

@@ -50,10 +50,8 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
      */
     public function listAction()
     {
-        $groups = $this->groupManager->findGroups();
-
         return $this->render('@FOSUser/Group/list.html.twig', array(
-            'groups' => $groups,
+            'groups' => $this->groupManager->findGroups(),
         ));
     }
 
@@ -66,10 +64,8 @@ public function listAction()
      */
     public function showAction($groupName)
     {
-        $group = $this->findGroupBy('name', $groupName);
-
         return $this->render('@FOSUser/Group/show.html.twig', array(
-            'group' => $group,
+            'group' => $this->findGroupBy('name', $groupName),
         ));
     }
 
@@ -94,20 +90,16 @@ public function editAction(Request $request, $groupName)
             return $event->getResponse();
         }
 
-        $formFactory = $this->formFactory;
-
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($group);
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $groupManager = $this->groupManager;
-
             $event = new FormEvent($form, $request);
             $dispatcher->dispatch(FOSUserEvents::GROUP_EDIT_SUCCESS, $event);
 
-            $groupManager->updateGroup($group);
+            $this->groupManager->updateGroup($group);
 
             if (null === $response = $event->getResponse()) {
                 $url = $this->generateUrl('fos_user_group_show', array('groupName' => $group->getName()));
@@ -135,14 +127,13 @@ public function editAction(Request $request, $groupName)
     public function newAction(Request $request)
     {
         $groupManager = $this->groupManager;
-        $formFactory = $this->formFactory;
         $dispatcher = $this->eventDispatcher;
 
         $group = $groupManager->createGroup('');
 
         $dispatcher->dispatch(FOSUserEvents::GROUP_CREATE_INITIALIZE, new GroupEvent($group, $request));
 
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($group);
 
         $form->handleRequest($request);
@@ -183,8 +174,7 @@ public function deleteAction(Request $request, $groupName)
 
         $response = new RedirectResponse($this->generateUrl('fos_user_group_list'));
 
-        $dispatcher = $this->eventDispatcher;
-        $dispatcher->dispatch(FOSUserEvents::GROUP_DELETE_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
+        $this->eventDispatcher->dispatch(FOSUserEvents::GROUP_DELETE_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
 
         return $response;
     }

Controller/ProfileController.php

@@ -85,20 +85,16 @@ public function editAction(Request $request)
             return $event->getResponse();
         }
 
-        $formFactory = $this->formFactory;
-
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($user);
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $userManager = $this->userManager;
-
             $event = new FormEvent($form, $request);
             $dispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_SUCCESS, $event);
 
-            $userManager->updateUser($user);
+            $this->userManager->updateUser($user);
 
             if (null === $response = $event->getResponse()) {
                 $url = $this->generateUrl('fos_user_profile_show');

Controller/RegistrationController.php

@@ -56,7 +56,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
      */
     public function registerAction(Request $request)
     {
-        $formFactory = $this->formFactory;
         $userManager = $this->userManager;
         $dispatcher = $this->eventDispatcher;
 
@@ -70,7 +69,7 @@ public function registerAction(Request $request)
             return $event->getResponse();
         }
 
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($user);
 
         $form->handleRequest($request);

Controller/ResettingController.php

@@ -40,14 +40,16 @@ class ResettingController extends AbstractController
     private $userManager;
     private $tokenGenerator;
     private $mailer;
+    private $retryTtl;
 
-    public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager, TokenGeneratorInterface $tokenGenerator, MailerInterface $mailer)
+    public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager, TokenGeneratorInterface $tokenGenerator, MailerInterface $mailer, $retryTtl)
     {
         $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
         $this->tokenGenerator = $tokenGenerator;
         $this->mailer = $mailer;
+        $this->retryTtl = $retryTtl;
     }
 
     /**
@@ -81,9 +83,7 @@ public function sendEmailAction(Request $request)
             return $event->getResponse();
         }
 
-        $ttl = $this->container->getParameter('fos_user.resetting.retry_ttl');
-
-        if (null !== $user && !$user->isPasswordRequestNonExpired($ttl)) {
+        if (null !== $user && !$user->isPasswordRequestNonExpired($this->retryTtl)) {
             $event = new GetResponseUserEvent($user, $request);
             $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_REQUEST, $event);
 
@@ -136,7 +136,7 @@ public function checkEmailAction(Request $request)
         }
 
         return $this->render('@FOSUser/Resetting/check_email.html.twig', array(
-            'tokenLifetime' => ceil($this->container->getParameter('fos_user.resetting.retry_ttl') / 3600),
+            'tokenLifetime' => ceil($this->retryTtl / 3600),
         ));
     }
 
@@ -150,7 +150,6 @@ public function checkEmailAction(Request $request)
      */
     public function resetAction(Request $request, $token)
     {
-        $formFactory = $this->formFactory;
         $userManager = $this->userManager;
         $dispatcher = $this->eventDispatcher;
 
@@ -167,7 +166,7 @@ public function resetAction(Request $request, $token)
             return $event->getResponse();
         }
 
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($user);
 
         $form->handleRequest($request);

Controller/SecurityController.php

@@ -58,8 +58,8 @@ public function loginAction(Request $request)
         // last username entered by the user
         $lastUsername = (null === $session) ? '' : $session->get($lastUsernameKey);
 
-        $csrfToken = $this->has('security.csrf.token_manager')
-            ? $this->get('security.csrf.token_manager')->getToken('authenticate')->getValue()
+        $csrfToken = $this->tokenManager
+            ? $this->tokenManager->getToken('authenticate')->getValue()
             : null;
 
         return $this->renderLogin(array(

Resources/config/resetting.xml

@@ -30,6 +30,7 @@
             <argument type="service" id="fos_user.user_manager" />
             <argument type="service" id="fos_user.util.token_generator" />
             <argument type="service" id="fos_user.mailer" />
+            <argument>%fos_user.resetting.retry_ttl%</argument>
         </service>
     </services>