Merge branch '6.2' into 6.3

* 6.2:
  Fix merge

Author: nicolas-grekas

Tests/SecurityTest.php

@@ -141,7 +141,7 @@ public function testLogin()
             ->willReturnMap([
                 ['request_stack', $requestStack],
                 ['security.firewall.map', $firewallMap],
-                ['security.authenticator.managers_locator', new ServiceLocator(['main' => fn () => $userAuthenticator])],
+                ['security.authenticator.managers_locator', $this->createContainer('main', $userAuthenticator)],
                 ['security.user_checker', $userChecker],
             ])
         ;
@@ -187,7 +187,7 @@ public function testLoginReturnsAuthenticatorResponse()
             ->willReturnMap([
                 ['request_stack', $requestStack],
                 ['security.firewall.map', $firewallMap],
-                ['security.user_authenticator', $userAuthenticator],
+                ['security.authenticator.managers_locator', $this->createContainer('main', $userAuthenticator)],
                 ['security.user_checker', $userChecker],
             ])
         ;