Merge branch '6.2' into 6.3

* 6.2:
  fix merge

Author: nicolas-grekas

DependencyInjection/Security/Factory/RememberMeFactory.php

@@ -70,10 +70,9 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             $tokenVerifier = $this->createTokenVerifier($container, $firewallName, $config['token_verifier'] ?? null);
             $container->setDefinition($rememberMeHandlerId, new ChildDefinition('security.authenticator.persistent_remember_me_handler'))
                 ->replaceArgument(0, new Reference($tokenProviderId))
-                ->replaceArgument(1, $config['secret'])
-                ->replaceArgument(2, new Reference($userProviderId))
-                ->replaceArgument(4, $config)
-                ->replaceArgument(6, $tokenVerifier)
+                ->replaceArgument(1, new Reference($userProviderId))
+                ->replaceArgument(3, $config)
+                ->replaceArgument(5, $tokenVerifier)
                 ->addTag('security.remember_me_handler', ['firewall' => $firewallName]);
         } else {
             $signatureHasherId = 'security.authenticator.remember_me_signature_hasher.'.$firewallName;

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -193,7 +193,7 @@ public function testPerListenerProviderWithRememberMeAndAnonymous()
             'firewalls' => [
                 'default' => [
                     'form_login' => ['provider' => 'second'],
-                    'remember_me' => ['secret' => 'baz'],
+                    'remember_me' => [],
                 ],
             ],
         ]);
@@ -535,7 +535,7 @@ public function testCustomRememberMeHandler()
         $container->loadFromExtension('security', [
             'firewalls' => [
                 'default' => [
-                    'remember_me' => ['secret' => 'very', 'service' => 'custom_remember_me'],
+                    'remember_me' => ['service' => 'custom_remember_me'],
                 ],
             ],
         ]);
@@ -566,25 +566,6 @@ public function testSecretRememberMeHasher()
         $this->assertSame('very', $handler->getArgument(2));
     }
 
-    public function testSecretRememberMeHandler()
-    {
-        $container = $this->getRawContainer();
-
-        $container->register('custom_remember_me', \stdClass::class);
-        $container->loadFromExtension('security', [
-            'firewalls' => [
-                'default' => [
-                    'remember_me' => ['secret' => 'very', 'token_provider' => 'token_provider_id'],
-                ],
-            ],
-        ]);
-
-        $container->compile();
-
-        $handler = $container->getDefinition('security.authenticator.remember_me_handler.default');
-        $this->assertSame('very', $handler->getArgument(1));
-    }
-
     public function sessionConfigurationProvider()
     {
         return [