Merge branch '5.4' into 6.0

* 5.4:
  [DependencyInjection] Fix named arguments when using ContainerBuilder before compilation

Author: nicolas-grekas

ContainerBuilder.php

@@ -1022,6 +1022,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);
 

Tests/ContainerBuilderTest.php

@@ -1732,10 +1732,7 @@ public function testFindTags()
         $this->assertSame(['tag1', 'tag2', 'tag3'], $container->findTags());
     }
 
-    /**
-     * @requires PHP 8
-     */
-    public function testNamedArgument()
+    public function testNamedArgumentAfterCompile()
     {
         $container = new ContainerBuilder();
         $container->register(E::class)
@@ -1749,6 +1746,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