[DependencyInjection] Fix order of arguments when mixing positional and named ones

nicolas-grekas · nicolas-grekas · commit 45d614df7985 · 2023-01-27T12:08:11.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -240,6 +240,10 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
         foreach ($parameters as $index => $parameter) {
             $this->defaultArgument->names[$index] = $parameter->name;
 
+            if (\array_key_exists($parameter->name, $arguments)) {
+                $arguments[$index] = $arguments[$parameter->name];
+                unset($arguments[$parameter->name]);
+            }
             if (\array_key_exists($index, $arguments) && '' !== $arguments[$index]) {
                 continue;
             }
@@ -341,7 +345,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
         // it's possible index 1 was set, then index 0, then 2, etc
         // make sure that we re-order so they're injected as expected
-        ksort($arguments);
+        ksort($arguments, \SORT_NATURAL);
 
         return $arguments;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -177,10 +177,17 @@ protected function processValue($value, bool $isRoot = false)
                 }
             }
 
+            $names = [];
+
             foreach ($reflectionMethod->getParameters() as $key => $parameter) {
+                $names[$key] = $parameter->name;
+
                 if (\array_key_exists($key, $arguments) && '' !== $arguments[$key]) {
                     continue;
                 }
+                if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name]) {
+                    continue;
+                }
 
                 $typeHint = ProxyHelper::getTypeHint($reflectionMethod, $parameter);
                 $name = Target::parseName($parameter);
@@ -210,8 +217,15 @@ protected function processValue($value, bool $isRoot = false)
                 }
             }
 
+            foreach ($names as $key => $name) {
+                if (\array_key_exists($name, $arguments) && (0 === $key || \array_key_exists($key - 1, $arguments))) {
+                    $arguments[$key] = $arguments[$name];
+                    unset($arguments[$name]);
+                }
+            }
+
             if ($arguments !== $call[1]) {
-                ksort($arguments);
+                ksort($arguments, \SORT_NATURAL);
                 $calls[$i][1] = $arguments;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1204,4 +1204,19 @@ public function testDecorationWithServiceAndAliasedInterface()
         static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorInterface::class));
         static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorImpl::class));
     }
+
+    public function testAutowireWithNamedArgs()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', MultipleArgumentsOptionalScalar::class)
+            ->setArguments(['foo' => 'abc'])
+            ->setAutowired(true)
+            ->setPublic(true);
+        $container->register(A::class, A::class);
+
+        (new AutowirePass())->process($container);
+
+        $this->assertEquals([new TypedReference(A::class, A::class), 'abc'], $container->getDefinition('foo')->getArguments());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -249,4 +249,24 @@ public function testBindWithTarget()
 
         $this->assertSame('bar', (string) $container->getDefinition('with_target')->getArgument(0));
     }
+
+    public function testBindWithNamedArgs()
+    {
+        $container = new ContainerBuilder();
+
+        $bindings = [
+            '$apiKey' => new BoundArgument('K'),
+        ];
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments(['c' => 'C', 'hostName' => 'H']);
+        $definition->setBindings($bindings);
+
+        $container->register('foo', CaseSensitiveClass::class);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+
+        $this->assertEquals(['C', 'K', 'H'], $definition->getArguments());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -177,10 +177,17 @@ protected function processValue($value, bool $isRoot = false)`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ $names = [];`
	`181`	`+`
`180`	`182`	`foreach ($reflectionMethod->getParameters() as $key => $parameter) {`
	`183`	`+ $names[$key] = $parameter->name;`
	`184`	`+`
`181`	`185`	`if (\array_key_exists($key, $arguments) && '' !== $arguments[$key]) {`
`182`	`186`	`continue;`
`183`	`187`	`}`
	`188`	`+ if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name]) {`
	`189`	`+ continue;`
	`190`	`+ }`
`184`	`191`
`185`	`192`	`$typeHint = ProxyHelper::getTypeHint($reflectionMethod, $parameter);`
`186`	`193`	`$name = Target::parseName($parameter);`
`@@ -210,8 +217,15 @@ protected function processValue($value, bool $isRoot = false)`
`210`	`217`	`}`
`211`	`218`	`}`
`212`	`219`
	`220`	`+ foreach ($names as $key => $name) {`
	`221`	`+ if (\array_key_exists($name, $arguments) && (0 === $key \|\| \array_key_exists($key - 1, $arguments))) {`
	`222`	`+ $arguments[$key] = $arguments[$name];`
	`223`	`+ unset($arguments[$name]);`
	`224`	`+ }`
	`225`	`+ }`
	`226`	`+`
`213`	`227`	`if ($arguments !== $call[1]) {`
`214`		`- ksort($arguments);`
	`228`	`+ ksort($arguments, \SORT_NATURAL);`
`215`	`229`	`$calls[$i][1] = $arguments;`
`216`	`230`	`}`
`217`	`231`	`}`