[DependencyInjection] Keep map indexes in ServiceLocatorTagPass::register

MatTheCat · MatTheCat · commit 00b545f8cb1d · 2025-06-04T17:48:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -64,7 +64,27 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
         }
 
-        $value->setArgument(0, self::map($services));
+        $i = 0;
+
+        foreach ($services as $k => $v) {
+            if ($v instanceof ServiceClosureArgument) {
+                continue;
+            }
+
+            if ($i === $k) {
+                if ($v instanceof Reference) {
+                    unset($services[$k]);
+                    $k = (string) $v;
+                }
+                ++$i;
+            } elseif (\is_int($k)) {
+                $i = null;
+            }
+
+            $services[$k] = new ServiceClosureArgument($v);
+        }
+
+        $value->setArgument(0, $services);
 
         $id = '.service_locator.'.ContainerBuilder::hash($value);
 
@@ -83,8 +103,12 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
     public static function register(ContainerBuilder $container, array $map, ?string $callerId = null): Reference
     {
+        foreach ($map as $k => $v) {
+            $map[$k] = new ServiceClosureArgument($v);
+        }
+
         $locator = (new Definition(ServiceLocator::class))
-            ->addArgument(self::map($map))
+            ->addArgument($map)
             ->addTag('container.service_locator');
 
         if (null !== $callerId && $container->hasDefinition($callerId)) {
@@ -109,29 +133,4 @@ public static function register(ContainerBuilder $container, array $map, ?string
 
         return new Reference($id);
     }
-
-    public static function map(array $services): array
-    {
-        $i = 0;
-
-        foreach ($services as $k => $v) {
-            if ($v instanceof ServiceClosureArgument) {
-                continue;
-            }
-
-            if ($i === $k) {
-                if ($v instanceof Reference) {
-                    unset($services[$k]);
-                    $k = (string) $v;
-                }
-                ++$i;
-            } elseif (\is_int($k)) {
-                $i = null;
-            }
-
-            $services[$k] = new ServiceClosureArgument($v);
-        }
-
-        return $services;
-    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -201,15 +201,31 @@ public function testIndexedByServiceIdWithDecoration()
         static::assertInstanceOf(DecoratedService::class, $locator->get(Service::class));
     }
 
-    public function testDefinitionOrderIsTheSame()
+    public function testServicesKeysAreKept()
     {
         $container = new ContainerBuilder();
         $container->register('service-1');
         $container->register('service-2');
 
         $locator = ServiceLocatorTagPass::register($container, [
-            new Reference('service-2'),
             new Reference('service-1'),
+            'service-2' => new Reference('service-2'),
+        ]);
+        $locator = $container->getDefinition($locator);
+        $factories = $locator->getArguments()[0];
+
+        static::assertSame([0, 'service-2'], array_keys($factories));
+    }
+
+    public function testDefinitionOrderIsTheSame()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service-1');
+        $container->register('service-2');
+
+        $locator = ServiceLocatorTagPass::register($container, [
+            'service-2' => new Reference('service-2'),
+            'service-1' => new Reference('service-1'),
         ]);
         $locator = $container->getDefinition($locator);
         $factories = $locator->getArguments()[0];
