[DependencyInjection] Fix named args support in ChildDefinition

dunglas · fabpot · commit 1ab3e413d4e7 · 2017-06-05T09:24:55.000-07:00
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -62,7 +62,7 @@ public function setParent($parent)
      * If replaceArgument() has been used to replace an argument, this method
      * will return the replacement value.
      *
-     * @param int $index
+     * @param int|string $index
      *
      * @return mixed The argument value
      *
@@ -74,13 +74,7 @@ public function getArgument($index)
             return $this->arguments['index_'.$index];
         }
 
-        $lastIndex = count(array_filter(array_keys($this->arguments), 'is_int')) - 1;
-
-        if ($index < 0 || $index > $lastIndex) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, $lastIndex));
-        }
-
-        return $this->arguments[$index];
+        return parent::getArgument($index);
     }
 
     /**
@@ -91,8 +85,8 @@ public function getArgument($index)
      * certain conventions when you want to overwrite the arguments of the
      * parent definition, otherwise your arguments will only be appended.
      *
-     * @param int   $index
-     * @param mixed $value
+     * @param int|string $index
+     * @param mixed      $value
      *
      * @return self the current instance
      *
@@ -105,7 +99,7 @@ public function replaceArgument($index, $value)
         } elseif (0 === strpos($index, '$')) {
             $this->arguments[$index] = $value;
         } else {
-            throw new InvalidArgumentException('$index must be an integer.');
+            throw new InvalidArgumentException('The argument must be an existing index or the name of a constructor\'s parameter.');
         }
 
         return $this;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
@@ -113,6 +113,10 @@ public function testReplaceArgument()
         $this->assertSame('baz', $def->getArgument(1));
 
         $this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz'), $def->getArguments());
+
+        $this->assertSame($def, $def->replaceArgument('$bar', 'val'));
+        $this->assertSame('val', $def->getArgument('$bar'));
+        $this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'), $def->getArguments());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function setParent($parent)`
`62`	`62`	`* If replaceArgument() has been used to replace an argument, this method`
`63`	`63`	`* will return the replacement value.`
`64`	`64`	`*`
`65`		`- * @param int $index`
	`65`	`+ * @param int\|string $index`
`66`	`66`	`*`
`67`	`67`	`* @return mixed The argument value`
`68`	`68`	`*`
`@@ -74,13 +74,7 @@ public function getArgument($index)`
`74`	`74`	`return $this->arguments['index_'.$index];`
`75`	`75`	`}`
`76`	`76`
`77`		`- $lastIndex = count(array_filter(array_keys($this->arguments), 'is_int')) - 1;`
`78`		`-`
`79`		`- if ($index < 0 \|\| $index > $lastIndex) {`
`80`		`- throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, $lastIndex));`
`81`		`- }`
`82`		`-`
`83`		`- return $this->arguments[$index];`
	`77`	`+ return parent::getArgument($index);`
`84`	`78`	`}`
`85`	`79`
`86`	`80`	`/**`
`@@ -91,8 +85,8 @@ public function getArgument($index)`
`91`	`85`	`* certain conventions when you want to overwrite the arguments of the`
`92`	`86`	`* parent definition, otherwise your arguments will only be appended.`
`93`	`87`	`*`
`94`		`- * @param int $index`
`95`		`- * @param mixed $value`
	`88`	`+ * @param int\|string $index`
	`89`	`+ * @param mixed $value`
`96`	`90`	`*`
`97`	`91`	`* @return self the current instance`
`98`	`92`	`*`
`@@ -105,7 +99,7 @@ public function replaceArgument($index, $value)`
`105`	`99`	`} elseif (0 === strpos($index, '$')) {`
`106`	`100`	`$this->arguments[$index] = $value;`
`107`	`101`	`} else {`
`108`		`- throw new InvalidArgumentException('$index must be an integer.');`
	`102`	`+ throw new InvalidArgumentException('The argument must be an existing index or the name of a constructor\'s parameter.');`
`109`	`103`	`}`
`110`	`104`
`111`	`105`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,10 @@ public function testReplaceArgument()`
`113`	`113`	`$this->assertSame('baz', $def->getArgument(1));`
`114`	`114`
`115`	`115`	`$this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz'), $def->getArguments());`
	`116`	`+`
	`117`	`+ $this->assertSame($def, $def->replaceArgument('$bar', 'val'));`
	`118`	`+ $this->assertSame('val', $def->getArgument('$bar'));`
	`119`	`+ $this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'), $def->getArguments());`
`116`	`120`	`}`
`117`	`121`
`118`	`122`	`/**`