Merge branch '6.0' into 6.1

* 6.0: [DependencyInjection] Fix named arguments when using ContainerBuilder before compilation
symfony · Jan 23, 2023 · 6ff7b7d · 6ff7b7d
2 parents 69f78fe + 34302da
commit 6ff7b7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1029,6 +1029,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/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -1763,7 +1763,7 @@ public function testFindTags()
         $this->assertSame(['tag1', 'tag2', 'tag3'], $container->findTags());
     }
 
-    public function testNamedArgument()
+    public function testNamedArgumentAfterCompile()
     {
         $container = new ContainerBuilder();
         $container->register(E::class)
@@ -1777,6 +1777,18 @@ public function testNamedArgument()
         $this->assertSame('', $e->first);
         $this->assertSame(2, $e->second);
     }
+
+    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