Commit70105d1

committed

[DependencyInjection] Fix named args support in ChildDefinition

1 parentadc39a2 commit70105d1Copy full SHA for 70105d1

File tree

+11

-3

lines changed

src/Symfony/Component/DependencyInjection
- ChildDefinition.php
- Tests
  - ChildDefinitionTest.php

+11

-3

lines changed

Lines changed: 7 additions & 3 deletions

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,6 +74,10 @@ public function getArgument($index)`
`74`	`74`	`return$this->arguments['index_'.$index];`
`75`	`75`	`}`
`76`	`76`
	`77`	`+if (0 ===strpos($index,'$') &&array_key_exists($index,$this->arguments)) {`
	`78`	`+return$this->arguments[$index];`
	`79`	`+ }`
	`80`	`+`
`77`	`81`	`$lastIndex =count(array_filter(array_keys($this->arguments),'is_int')) -1;`
`78`	`82`
`79`	`83`	`if ($index <0 \|\|$index >$lastIndex) {`
`@@ -91,8 +95,8 @@ public function getArgument($index)`
`91`	`95`	`* certain conventions when you want to overwrite the arguments of the`
`92`	`96`	`* parent definition, otherwise your arguments will only be appended.`
`93`	`97`	`*`
`94`		`- * @param int $index`
`95`		`- * @param mixed $value`
	`98`	`+ * @param int\|string $index`
	`99`	`+ * @param mixed$value`
`96`	`100`	`*`
`97`	`101`	`* @return self the current instance`
`98`	`102`	`*`

Lines changed: 4 additions & 0 deletions

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`	`/**`

Comments

(0)