Making more updates after a new feature was merged

Author: weaverryan

Controller/ProfileController.php

@@ -28,6 +28,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Controller managing the user profile.
@@ -39,12 +40,16 @@ class ProfileController extends AbstractController
     private $eventDispatcher;
     private $formFactory;
     private $userManager;
+    private $emailUpdateConfirmation;
+    private $translator;
 
-    public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager)
+    public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager, EmailUpdateConfirmation $emailUpdateConfirmation, TranslatorInterface $translator)
     {
         $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
+        $this->emailUpdateConfirmation = $emailUpdateConfirmation;
+        $this->translator = $translator;
     }
 
     /**
@@ -121,42 +126,33 @@ public function editAction(Request $request)
      */
     public function confirmEmailUpdateAction(Request $request, $token)
     {
-        $userManager = $this->container->get('fos_user.user_manager');
-
         /** @var User $user */
-        $user = $userManager->findUserByConfirmationToken($token);
+        $user = $this->userManager->findUserByConfirmationToken($token);
 
         // If user was not found throw 404 exception
         if (!$user) {
-            /** @var Translator $translator */
-            $translator = $this->get('translator');
-            throw $this->createNotFoundException($translator->trans('email_update.error.message', array(), 'FOSUserBundle'));
+            throw $this->createNotFoundException($this->translator->trans('email_update.error.message', array(), 'FOSUserBundle'));
         }
 
         // Show invalid token message if the user id found via token does not match the current users id (e.g. anon. or other user)
         if (!($this->getUser() instanceof UserInterface) || ($user->getId() !== $this->getUser()->getId())) {
-            /** @var Translator $translator */
-            $translator = $this->get('translator');
-            throw new AccessDeniedException($translator->trans('email_update.error.message', array(), 'FOSUserBundle'));
+            throw new AccessDeniedException($this->translator->trans('email_update.error.message', array(), 'FOSUserBundle'));
         }
 
-        /** @var EmailUpdateConfirmation $emailUpdateConfirmation */
-        $emailUpdateConfirmation = $this->get('fos_user.email_update_confirmation');
-
-        $emailUpdateConfirmation->setUser($user);
+        $this->emailUpdateConfirmation->setUser($user);
 
-        $newEmail = $emailUpdateConfirmation->fetchEncryptedEmailFromConfirmationLink($request->get('target'));
+        $newEmail = $this->emailUpdateConfirmation->fetchEncryptedEmailFromConfirmationLink($request->get('target'));
 
         // Update user email
         if ($newEmail) {
-            $user->setConfirmationToken($emailUpdateConfirmation->getEmailConfirmedToken());
+            $user->setConfirmationToken($this->emailUpdateConfirmation->getEmailConfirmedToken());
             $user->setEmail($newEmail);
         }
 
-        $userManager->updateUser($user);
+        $this->userManager->updateUser($user);
 
         $event = new UserEvent($user, $request);
-        $this->get('event_dispatcher')->dispatch(FOSUserEvents::EMAIL_UPDATE_SUCCESS, $event);
+        $this->eventDispatcher->dispatch(FOSUserEvents::EMAIL_UPDATE_SUCCESS, $event);
 
         return $this->redirect($this->generateUrl('fos_user_profile_show'));
     }

Resources/config/profile.xml

@@ -22,6 +22,8 @@
             <argument type="service" id="event_dispatcher" />
             <argument type="service" id="fos_user.profile.form.factory" />
             <argument type="service" id="fos_user.user_manager" />
+            <argument type="service" id="fos_user.user_manager" />
+            <argument type="service" id="translator" />
         </service>
     </services>