Merge pull request #3056 from stof/fix_confirmation_email

Fix the access to the session in the email confirmation listener

Author: stof

EventListener/EmailConfirmationListener.php

@@ -17,7 +17,6 @@
 use FOS\UserBundle\Util\TokenGeneratorInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -30,17 +29,15 @@ class EmailConfirmationListener implements EventSubscriberInterface
     private $mailer;
     private $tokenGenerator;
     private $router;
-    private $session;
 
     /**
      * EmailConfirmationListener constructor.
      */
-    public function __construct(MailerInterface $mailer, TokenGeneratorInterface $tokenGenerator, UrlGeneratorInterface $router, SessionInterface $session)
+    public function __construct(MailerInterface $mailer, TokenGeneratorInterface $tokenGenerator, UrlGeneratorInterface $router)
     {
         $this->mailer = $mailer;
         $this->tokenGenerator = $tokenGenerator;
         $this->router = $router;
-        $this->session = $session;
     }
 
     public static function getSubscribedEvents(): array
@@ -62,7 +59,7 @@ public function onRegistrationSuccess(FormEvent $event)
 
         $this->mailer->sendConfirmationEmailMessage($user);
 
-        $this->session->set('fos_user_send_confirmation_email/email', $user->getEmail());
+        $event->getRequest()->getSession()->set('fos_user_send_confirmation_email/email', $user->getEmail());
 
         $url = $this->router->generate('fos_user_registration_check_email');
         $event->setResponse(new RedirectResponse($url));

Resources/config/email_confirmation.xml

@@ -10,7 +10,6 @@
             <argument type="service" id="fos_user.mailer" />
             <argument type="service" id="fos_user.util.token_generator" />
             <argument type="service" id="router" />
-            <argument type="service" id="session" />
         </service>
     </services>