[DependencyInjection] Fix using autowiring types when there are more than 2 services

GuilhemN · GuilhemN · commit 59812785378b · 2017-02-19T12:40:30.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -169,6 +169,7 @@ private function populateAvailableType($id, Definition $definition)
         foreach ($definition->getAutowiringTypes() as $type) {
             $this->definedTypes[$type] = true;
             $this->types[$type] = $id;
+            unset($this->notGuessableTypes[$type]);
         }
 
         if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -173,15 +173,16 @@ public function testTypeNotGuessableWithTypeSet()
         $container = new ContainerBuilder();
 
         $container->register('a1', __NAMESPACE__.'\Foo');
-        $container->register('a2', __NAMESPACE__.'\Foo')->addAutowiringType(__NAMESPACE__.'\Foo');
+        $container->register('a2', __NAMESPACE__.'\Foo');
+        $container->register('a3', __NAMESPACE__.'\Foo')->addAutowiringType(__NAMESPACE__.'\Foo');
         $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
         $aDefinition->setAutowired(true);
 
         $pass = new AutowirePass();
         $pass->process($container);
 
         $this->assertCount(1, $container->getDefinition('a')->getArguments());
-        $this->assertEquals('a2', (string) $container->getDefinition('a')->getArgument(0));
+        $this->assertEquals('a3', (string) $container->getDefinition('a')->getArgument(0));
     }
 
     public function testWithTypeSet()

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ private function populateAvailableType($id, Definition $definition)`
`169`	`169`	`foreach ($definition->getAutowiringTypes() as $type) {`
`170`	`170`	`$this->definedTypes[$type] = true;`
`171`	`171`	`$this->types[$type] = $id;`
	`172`	`+ unset($this->notGuessableTypes[$type]);`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {`