bug #49077 [DependencyInjection] Fix named arguments when using ContainerBuilder before compilation (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 01344e3ecc92 · 2023-01-23T16:44:12.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] Fix named arguments when using ContainerBuilder before compilation | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49074 | License | MIT | Doc PR | - Commits ------- 0d2f828 [DependencyInjection] Fix named arguments when using ContainerBuilder before compilation
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1089,6 +1089,10 @@ private function createService(Definition $definition, array &$inlineServices, b
             return $this->services[$id] ?? $this->privates[$id];
         }
 
+        if (!array_is_list($arguments)) {
+            $arguments = array_combine(array_map(function ($k) { return preg_replace('/^.*\\$/', '', $k); }, array_keys($arguments)), $arguments);
+        }
+
         if (null !== $factory) {
             $service = $factory(...$arguments);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1777,7 +1777,7 @@ public function testFindTags()
     /**
      * @requires PHP 8
      */
-    public function testNamedArgument()
+    public function testNamedArgumentAfterCompile()
     {
         $container = new ContainerBuilder();
         $container->register(E::class)
@@ -1791,6 +1791,21 @@ public function testNamedArgument()
         $this->assertSame('', $e->first);
         $this->assertSame(2, $e->second);
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testNamedArgumentBeforeCompile()
+    {
+        $container = new ContainerBuilder();
+        $container->register(E::class, E::class)
+            ->setPublic(true)
+            ->setArguments(['$first' => 1]);
+
+        $e = $container->get(E::class);
+
+        $this->assertSame(1, $e->first);
+    }
 }
 
 class FooClass

Original file line number	Diff line number	Diff line change
`@@ -1089,6 +1089,10 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1089`	`1089`	`return $this->services[$id] ?? $this->privates[$id];`
`1090`	`1090`	`}`
`1091`	`1091`
	`1092`	`+ if (!array_is_list($arguments)) {`
	`1093`	`+ $arguments = array_combine(array_map(function ($k) { return preg_replace('/^.*\\$/', '', $k); }, array_keys($arguments)), $arguments);`
	`1094`	`+ }`
	`1095`	`+`
`1092`	`1096`	`if (null !== $factory) {`
`1093`	`1097`	`$service = $factory(...$arguments);`
`1094`	`1098`