bug #22358 [DI] Fix named args overridding (nicolas-grekas)

fabpot · fabpot · commit aada1a14ccea · 2017-04-10T08:25:06.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix named args overridding | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22196 | License | MIT | Doc PR | - (The exception check in ResolveDefinitionTemplatesPass is not done in ResolveNamedArgumentsPass.) Commits ------- 0c030d9 [DI] Fix named args overridding
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -161,16 +161,11 @@ public static function mergeDefinition(Definition $def, ChildDefinition $definit
         foreach ($definition->getArguments() as $k => $v) {
             if (is_numeric($k)) {
                 $def->addArgument($v);
-                continue;
-            }
-
-            if (0 === strpos($k, 'index_')) {
-                $index = (int) substr($k, strlen('index_'));
-            } elseif (0 !== strpos($k, '$')) {
-                throw new RuntimeException(sprintf('Invalid argument key "%s" found.', $k));
+            } elseif (0 === strpos($k, 'index_')) {
+                $def->replaceArgument((int) substr($k, strlen('index_')), $v);
+            } else {
+                $def->setArgument($k, $v);
             }
-
-            $def->replaceArgument($index, $v);
         }
 
         // merge properties
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -216,6 +216,13 @@ public function replaceArgument($index, $argument)
         return $this;
     }
 
+    public function setArgument($key, $value)
+    {
+        $this->arguments[$key] = $value;
+
+        return $this;
+    }
+
     /**
      * Gets the arguments to pass to the service constructor/factory method.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -364,6 +364,23 @@ public function testProcessResolvesAliases()
         $this->assertSame('ParentClass', $def->getClass());
     }
 
+    public function testProcessSetsArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass')->setArguments(array(0));
+        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments(array(
+            1,
+            'index_0' => 2,
+            'foo' => 3,
+        )));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame(array(2, 1, 'foo' => 3), $def->getArguments());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,13 @@ public function replaceArgument($index, $argument)`
`216`	`216`	`return $this;`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ public function setArgument($key, $value)`
	`220`	`+ {`
	`221`	`+ $this->arguments[$key] = $value;`
	`222`	`+`
	`223`	`+ return $this;`
	`224`	`+ }`
	`225`	`+`
`219`	`226`	`/**`
`220`	`227`	`* Gets the arguments to pass to the service constructor/factory method.`
`221`	`228`	`*`