[DependencyInjection] Autowing: exclude abstract definitons

dunglas · dunglas · commit ac456eedc8a3 · 2015-11-06T14:13:58.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -138,11 +138,17 @@ private function populateAvailableTypes()
      */
     private function populateAvailableType($id, Definition $definition)
     {
+        // Never use abstract services
+        if ($definition->isAbstract()) {
+            return;
+        }
+
         foreach ($definition->getAutowiringTypes() as $type) {
             $this->definedTypes[$type] = true;
             $this->types[$type] = $id;
         }
 
+        // Cannot use reflection if the class isn't set
         if (!$definition->getClass()) {
             return;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -202,6 +202,7 @@ public function testDontTriggerAutowiring()
         $this->assertCount(0, $container->getDefinition('bar')->getArguments());
     }
 
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      * @expectedExceptionMessage Cannot autowire argument 2 for Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument because the type-hinted class does not exist (Class Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass does not exist).
@@ -210,12 +211,27 @@ public function testClassNotFoundThrowsException()
     {
         $container = new ContainerBuilder();
 
-        $aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
+        $aDefinition = $container->register('a', __NAMESPACE__ . '\BadTypeHintedArgument');
         $aDefinition->setAutowired(true);
 
         $pass = new AutowirePass();
         $pass->process($container);
     }
+
+    public function testDontUseAbstractServices()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('abstract_foo', __NAMESPACE__.'\Foo')->setAbstract(true);
+        $container->register('foo', __NAMESPACE__.'\Foo');
+        $container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $arguments = $container->getDefinition('bar')->getArguments();
+        $this->assertSame('foo', (string) $arguments[0]);
+    }
 }
 
 class Foo

Original file line number	Diff line number	Diff line change
`@@ -138,11 +138,17 @@ private function populateAvailableTypes()`
`138`	`138`	`*/`
`139`	`139`	`private function populateAvailableType($id, Definition $definition)`
`140`	`140`	`{`
	`141`	`+ // Never use abstract services`
	`142`	`+ if ($definition->isAbstract()) {`
	`143`	`+ return;`
	`144`	`+ }`
	`145`	`+`
`141`	`146`	`foreach ($definition->getAutowiringTypes() as $type) {`
`142`	`147`	`$this->definedTypes[$type] = true;`
`143`	`148`	`$this->types[$type] = $id;`
`144`	`149`	`}`
`145`	`150`
	`151`	`+ // Cannot use reflection if the class isn't set`
`146`	`152`	`if (!$definition->getClass()) {`
`147`	`153`	`return;`
`148`	`154`	`}`