Merge branch '6.1' into 6.2

* 6.1:
  Revert "minor #47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
  [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container
  [DependencyInjection] Fix support for named arguments on non-autowired services

Author: nicolas-grekas

Compiler/ResolveNamedArgumentsPass.php

@@ -40,6 +40,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         foreach ($calls as $i => $call) {
             [$method, $arguments] = $call;
             $parameters = null;
+            $resolvedKeys = [];
             $resolvedArguments = [];
 
             foreach ($arguments as $key => $argument) {
@@ -48,6 +49,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 }
 
                 if (\is_int($key)) {
+                    $resolvedKeys[$key] = $key;
                     $resolvedArguments[$key] = $argument;
                     continue;
                 }
@@ -68,9 +70,11 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                         if ($key === '$'.$p->name) {
                             if ($p->isVariadic() && \is_array($argument)) {
                                 foreach ($argument as $variadicArgument) {
+                                    $resolvedKeys[$j] = $j;
                                     $resolvedArguments[$j++] = $variadicArgument;
                                 }
                             } else {
+                                $resolvedKeys[$j] = $p->name;
                                 $resolvedArguments[$j] = $argument;
                             }
 
@@ -88,6 +92,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 $typeFound = false;
                 foreach ($parameters as $j => $p) {
                     if (!\array_key_exists($j, $resolvedArguments) && ProxyHelper::exportType($p, true) === $key) {
+                        $resolvedKeys[$j] = $p->name;
                         $resolvedArguments[$j] = $argument;
                         $typeFound = true;
                     }
@@ -100,6 +105,12 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
             if ($resolvedArguments !== $call[1]) {
                 ksort($resolvedArguments);
+
+                if (!$value->isAutowired() && !array_is_list($resolvedArguments)) {
+                    ksort($resolvedKeys);
+                    $resolvedArguments = array_combine($resolvedKeys, $resolvedArguments);
+                }
+
                 $calls[$i][1] = $resolvedArguments;
             }
         }

ContainerBuilder.php

@@ -1048,12 +1048,12 @@ private function createService(Definition $definition, array &$inlineServices, b
 
             if (\is_object($tryProxy)) {
                 if ($r->getConstructor()) {
-                    $tryProxy->__construct(...array_values($arguments));
+                    $tryProxy->__construct(...$arguments);
                 }
 
                 $service = $tryProxy;
             } else {
-                $service = $r->getConstructor() ? $r->newInstanceArgs(array_values($arguments)) : $r->newInstance();
+                $service = $r->getConstructor() ? $r->newInstanceArgs($arguments) : $r->newInstance();
             }
 
             if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {

Tests/Compiler/ResolveNamedArgumentsPassTest.php

@@ -165,7 +165,7 @@ public function testInterfaceTypedArgument()
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertSame($expected, $definition->getArgument(3));
+        $this->assertSame($expected, $definition->getArgument('container'));
     }
 
     public function testResolvesMultipleArgumentsOfTheSameType()

Tests/ContainerBuilderTest.php

@@ -1829,6 +1829,21 @@ public function testFindTags()
 
         $this->assertSame(['tag1', 'tag2', 'tag3'], $container->findTags());
     }
+
+    public function testNamedArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register(E::class)
+            ->setPublic(true)
+            ->setArguments(['$second' => 2]);
+
+        $container->compile();
+
+        $e = $container->get(E::class);
+
+        $this->assertSame('', $e->first);
+        $this->assertSame(2, $e->second);
+    }
 }
 
 class FooClass
@@ -1857,3 +1872,15 @@ class C implements X
 class D implements X
 {
 }
+
+class E
+{
+    public $first;
+    public $second;
+
+    public function __construct($first = '', $second = '')
+    {
+        $this->first = $first;
+        $this->second = $second;
+    }
+}