bug #22311 [DI] Fix second auto-registration (nicolas-grekas)

fabpot · fabpot · commit 0eb4d2a4d7b4 · 2017-04-06T09:16:06.000-07:00
This PR was merged into the 2.8 branch. Discussion ---------- [DI] Fix second auto-registration | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22309 | License | MIT | Doc PR | - My bad Commits ------- c02de84 [DI] Fix second auto-registration
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -116,7 +116,8 @@ private function completeDefinition($id, Definition $definition)
                 }
 
                 if (isset($this->autowired[$typeHint->name])) {
-                    return $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
+                    $arguments[$index] = $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
+                    continue;
                 }
 
                 if (null === $this->types) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -212,8 +212,9 @@ public function testCreateDefinition()
         $pass = new AutowirePass();
         $pass->process($container);
 
-        $this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());
+        $this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());
         $this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
+        $this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
 
         $dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
         $this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
@@ -600,7 +601,7 @@ public function __construct(Lille $l)
 
 class LesTilleuls
 {
-    public function __construct(Dunglas $k)
+    public function __construct(Dunglas $j, Dunglas $k)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ private function completeDefinition($id, Definition $definition)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if (isset($this->autowired[$typeHint->name])) {`
`119`		`- return $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;`
	`119`	`+ $arguments[$index] = $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;`
	`120`	`+ continue;`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`if (null === $this->types) {`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,9 @@ public function testCreateDefinition()`
`212`	`212`	`$pass = new AutowirePass();`
`213`	`213`	`$pass->process($container);`
`214`	`214`
`215`		`- $this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());`
	`215`	`+ $this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());`
`216`	`216`	`$this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));`
	`217`	`+ $this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));`
`217`	`218`
`218`	`219`	`$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');`
`219`	`220`	`$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());`
`@@ -600,7 +601,7 @@ public function __construct(Lille $l)`
`600`	`601`
`601`	`602`	`class LesTilleuls`
`602`	`603`	`{`
`603`		`- public function __construct(Dunglas $k)`
	`604`	`+ public function __construct(Dunglas $j, Dunglas $k)`
`604`	`605`	`{`
`605`	`606`	`}`
`606`	`607`	`}`