LoginLink create get Request Locale

roromix · fabpot · commit 433d76bfe116 · 2021-04-02T08:14:21.000+02:00
diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php
@@ -64,7 +64,11 @@ public function createLoginLink(UserInterface $user, Request $request = null): L
 
         if ($request) {
             $currentRequestContext = $this->urlGenerator->getContext();
-            $this->urlGenerator->setContext((new RequestContext())->fromRequest($request));
+            $this->urlGenerator->setContext(
+                (new RequestContext())
+                    ->fromRequest($request)
+                    ->setParameter('_locale', $request->getLocale())
+            );
         }
 
         try {
diff --git a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
@@ -69,7 +69,11 @@ public function testCreateLoginLink($user, array $extraProperties, Request $requ
         if ($request) {
             $this->router->expects($this->once())
                 ->method('getContext')
-                ->willReturn(new RequestContext());
+                ->willReturn($currentRequestContext = new RequestContext());
+
+            $this->router->expects($this->exactly(2))
+                ->method('setContext')
+                ->withConsecutive([$this->equalTo((new RequestContext())->fromRequest($request)->setParameter('_locale', $request->getLocale()))], [$currentRequestContext]);
         }
 
         $loginLink = $this->createLinker([], array_keys($extraProperties))->createLoginLink($user, $request);
