Merge branch '5.4' into 6.0

* 5.4:
  Revert "minor #47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
  [Yaml] Minor: Update Inline parse phpdoc
  [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container
  [DependencyInjection] Fix dumping inlined withers
  [HttpClient] Move Http clients data collecting at a late level
  [DependencyInjection] Fix support for named arguments on non-autowired services
  [FrameworkBundle] restore call to addGlobalIgnoredName
  Allow EmailValidator 4
  Fix detecting mapping with one line annotations

Author: nicolas-grekas

Compiler/ResolveNamedArgumentsPass.php

@@ -43,6 +43,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) {
@@ -51,6 +52,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 }
 
                 if (\is_int($key)) {
+                    $resolvedKeys[$key] = $key;
                     $resolvedArguments[$key] = $argument;
                     continue;
                 }
@@ -71,9 +73,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;
                             }
 
@@ -91,6 +95,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 $typeFound = false;
                 foreach ($parameters as $j => $p) {
                     if (!\array_key_exists($j, $resolvedArguments) && ProxyHelper::getTypeHint($r, $p, true) === $key) {
+                        $resolvedKeys[$j] = $p->name;
                         $resolvedArguments[$j] = $argument;
                         $typeFound = true;
                     }
@@ -103,6 +108,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

@@ -1035,7 +1035,7 @@ private function createService(Definition $definition, array &$inlineServices, b
         } else {
             $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
 
-            $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs(array_values($arguments));
+            $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
 
             if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
                 trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);

Dumper/PhpDumper.php

@@ -743,7 +743,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN
             $witherAssignation = '';
 
             if ($call[2] ?? false) {
-                if (null !== $sharedNonLazyId && $lastWitherIndex === $k) {
+                if (null !== $sharedNonLazyId && $lastWitherIndex === $k && 'instance' === $variableName) {
                     $witherAssignation = sprintf('$this->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
                 }
                 $witherAssignation .= sprintf('$%s = ', $variableName);

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

@@ -1731,6 +1731,24 @@ public function testFindTags()
 
         $this->assertSame(['tag1', 'tag2', 'tag3'], $container->findTags());
     }
+
+    /**
+     * @requires PHP 8
+     */
+    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
@@ -1759,3 +1777,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;
+    }
+}

Tests/Dumper/PhpDumperTest.php

@@ -1396,7 +1396,8 @@ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheSer
     public function testWither()
     {
         $container = new ContainerBuilder();
-        $container->register(Foo::class);
+        $container->register(Foo::class)
+            ->setAutowired(true);
 
         $container
             ->register('wither', Wither::class)

Tests/Fixtures/includes/autowiring_classes.php

@@ -15,6 +15,14 @@
 
 class Foo
 {
+    /**
+     * @required
+     * @return static
+     */
+    public function cloneFoo()
+    {
+        return clone $this;
+    }
 }
 
 class Bar

Tests/Fixtures/php/services_wither.php

@@ -53,6 +53,7 @@ protected function getWitherService()
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
 
         $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
+        $a = $a->cloneFoo();
 
         $instance = $instance->withFoo1($a);
         $this->services['wither'] = $instance = $instance->withFoo2($a);