Fixing a bug where an odd number of type collisions would incorrectly…

… autowire (instead of an error)
symfony · fabpot · Mar 10, 2016 · Mar 6, 2016 · Mar 6, 2016 · 2aea337f42cffed356250c36add8b25c691d315d
commit 2aea337f42cffed356250c36add8b25c691d315d
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -181,19 +181,21 @@ private function set($type, $id)
            return;
        }

+        // is this already a type/class that is known to match multiple services?
+        if (isset($this->ambiguousServiceTypes[$type])) {
+            $this->addServiceToAmbiguousType($id, $type);
+
+            return;
+        }
+
        // check to make sure the type doesn't match multiple services
        if (isset($this->types[$type])) {
            if ($this->types[$type] === $id) {
                return;
            }

            // keep an array of all services matching this type
-            if (!isset($this->ambiguousServiceTypes[$type])) {
-                $this->ambiguousServiceTypes[$type] = array(
-                    $this->types[$type],
-                );
-            }
-            $this->ambiguousServiceTypes[$type][] = $id;
+            $this->addServiceToAmbiguousType($id, $type);

            unset($this->types[$type]);

@@ -265,4 +267,15 @@ private function getReflectionClass($id, Definition $definition)
            // return null
        }
    }
+
+    private function addServiceToAmbiguousType($id, $type)
+    {
+        // keep an array of all services matching this type
+        if (!isset($this->ambiguousServiceTypes[$type])) {
+            $this->ambiguousServiceTypes[$type] = array(
+                $this->types[$type],
+            );
+        }
+        $this->ambiguousServiceTypes[$type][] = $id;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -103,14 +103,15 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()

    /**
     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". Multiple services exist for this interface (c1, c2).
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". Multiple services exist for this interface (c1, c2, c3).
     */
    public function testTypeCollision()
    {
        $container = new ContainerBuilder();

        $container->register('c1', __NAMESPACE__.'\CollisionA');
        $container->register('c2', __NAMESPACE__.'\CollisionB');
+        $container->register('c3', __NAMESPACE__.'\CollisionB');
        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
        $aDefinition->setAutowired(true);