Merge pull request #2764 from benjaminb-/master

Redirect to login when using confirmation token already used or not found

Author: XWB

Controller/RegistrationController.php

@@ -24,7 +24,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
@@ -139,7 +138,7 @@ public function confirmAction(Request $request, $token)
         $user = $userManager->findUserByConfirmationToken($token);
 
         if (null === $user) {
-            throw new NotFoundHttpException(sprintf('The user with confirmation token "%s" does not exist', $token));
+            return new RedirectResponse($this->container->get('router')->generate('fos_user_security_login'));
         }
 
         $user->setConfirmationToken(null);