From 0d2f828a15e1b8d375a415cdaeccddba63cbabf1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 23 Jan 2023 16:37:22 +0100
Subject: [PATCH] [DependencyInjection] Fix named arguments when using
 ContainerBuilder before compilation

---
 .../DependencyInjection/ContainerBuilder.php    |  4 ++++
 .../Tests/ContainerBuilderTest.php              | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index bcfa623d7b2dd..e51691006e7c2 100644
--- 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
index 6ab7232d23a5e..5fa9c5dfbd813 100644
--- 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