[SecurityBundle] Keep authenticators’ service original ID as their name

MatTheCat · MatTheCat · commit 26925d1ab84e · 2025-01-01T19:08:02.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -312,11 +312,10 @@ private function createFirewalls(array $config, ContainerBuilder $container): vo
             if (!$firewallAuthenticators) {
                 $authenticators[$name] = null;
             } else {
-                $firewallAuthenticatorRefs = [];
-                foreach ($firewallAuthenticators as $authenticatorId) {
-                    $firewallAuthenticatorRefs[$authenticatorId] = new Reference($authenticatorId);
-                }
-                $authenticators[$name] = ServiceLocatorTagPass::register($container, $firewallAuthenticatorRefs);
+                $authenticators[$name] = ServiceLocatorTagPass::register($container, array_map(
+                    static fn (string $authenticatorId) => new Reference($authenticatorId),
+                    $firewallAuthenticators
+                ));
             }
             $contextId = 'security.firewall.map.context.'.$name;
             $isLazy = !$firewall['stateless'] && (!empty($firewall['anonymous']['lazy']) || $firewall['lazy']);
@@ -625,11 +624,11 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
                 $authenticators = $factory->createAuthenticator($container, $id, $firewall[$key], $userProvider);
                 if (\is_array($authenticators)) {
                     foreach ($authenticators as $authenticator) {
-                        $authenticationProviders[] = $authenticator;
+                        $authenticationProviders[$authenticator] = $authenticator;
                         $entryPoints[] = $authenticator;
                     }
                 } else {
-                    $authenticationProviders[] = $authenticators;
+                    $authenticationProviders[$authenticators] = $authenticators;
                     $entryPoints[$key] = $authenticators;
                 }
 
