Fixing bug where indexed args were set wrong in pass in some situations

weaverryan · weaverryan · commit 7cc7c859196e · 2017-05-09T05:53:08.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -40,7 +40,7 @@ protected function processValue($value, $isRoot = false)
 
             foreach ($arguments as $key => $argument) {
                 if (is_int($key)) {
-                    $resolvedArguments[] = $argument;
+                    $resolvedArguments[$key] = $argument;
                     continue;
                 }
                 if ('' === $key || '$' !== $key[0]) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
@@ -27,13 +27,17 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setArguments(array(0 => new Reference('foo'), '$apiKey' => '123'));
+        $definition->setArguments(array(
+            2 => 'http://api.example.com',
+            '$apiKey' => '123',
+            0 => new Reference('foo'),
+        ));
         $definition->addMethodCall('setApiKey', array('$apiKey' => '123'));
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(0 => new Reference('foo'), 1 => '123'), $definition->getArguments());
+        $this->assertEquals(array(0 => new Reference('foo'), 1 => '123', 2 => 'http://api.example.com'), $definition->getArguments());
         $this->assertEquals(array(array('setApiKey', array('123'))), $definition->getMethodCalls());
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedArgumentsDummy.php
@@ -7,7 +7,7 @@
  */
 class NamedArgumentsDummy
 {
-    public function __construct(CaseSensitiveClass $c, $apiKey)
+    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName)
     {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected function processValue($value, $isRoot = false)`
`40`	`40`
`41`	`41`	`foreach ($arguments as $key => $argument) {`
`42`	`42`	`if (is_int($key)) {`
`43`		`- $resolvedArguments[] = $argument;`
	`43`	`+ $resolvedArguments[$key] = $argument;`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`	`46`	`if ('' === $key \|\| '$' !== $key[0]) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*/`
`8`	`8`	`class NamedArgumentsDummy`
`9`	`9`	`{`
`10`		`- public function __construct(CaseSensitiveClass $c, $apiKey)`
	`10`	`+ public function __construct(CaseSensitiveClass $c, $apiKey, $hostName)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`