minor #17900 [DependencyInjection] Simplified code in AutowirePass (hason)

fabpot · fabpot · commit cc9f6b0a9567 · 2016-02-26T07:30:51.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [DependencyInjection] Simplified code in AutowirePass | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- ce0357e [DependencyInjection] Simplified code in AutowirePass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -148,45 +148,17 @@ private function populateAvailableType($id, Definition $definition)
             $this->types[$type] = $id;
         }
 
-        // Cannot use reflection if the class isn't set
-        if (!$definition->getClass()) {
+        if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
             return;
         }
 
-        if ($reflectionClass = $this->getReflectionClass($id, $definition)) {
-            $this->extractInterfaces($id, $reflectionClass);
-            $this->extractAncestors($id, $reflectionClass);
-        }
-    }
-
-    /**
-     * Extracts the list of all interfaces implemented by a class.
-     *
-     * @param string           $id
-     * @param \ReflectionClass $reflectionClass
-     */
-    private function extractInterfaces($id, \ReflectionClass $reflectionClass)
-    {
-        foreach ($reflectionClass->getInterfaces() as $interfaceName => $reflectionInterface) {
-            $this->set($interfaceName, $id);
-
-            $this->extractInterfaces($id, $reflectionInterface);
+        foreach ($reflectionClass->getInterfaces() as $reflectionInterface) {
+            $this->set($reflectionInterface->name, $id);
         }
-    }
-
-    /**
-     * Extracts all inherited types of a class.
-     *
-     * @param string           $id
-     * @param \ReflectionClass $reflectionClass
-     */
-    private function extractAncestors($id, \ReflectionClass $reflectionClass)
-    {
-        $this->set($reflectionClass->name, $id);
 
-        if ($reflectionParentClass = $reflectionClass->getParentClass()) {
-            $this->extractAncestors($id, $reflectionParentClass);
-        }
+        do {
+            $this->set($reflectionClass->name, $id);
+        } while ($reflectionClass = $reflectionClass->getParentClass());
     }
 
     /**
@@ -256,6 +228,7 @@ private function getReflectionClass($id, Definition $definition)
             return $this->reflectionClasses[$id];
         }
 
+        // Cannot use reflection if the class isn't set
         if (!$class = $definition->getClass()) {
             return;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -61,9 +61,10 @@ public function testProcessAutowireInterface()
         $pass = new AutowirePass();
         $pass->process($container);
 
-        $this->assertCount(2, $container->getDefinition('g')->getArguments());
+        $this->assertCount(3, $container->getDefinition('g')->getArguments());
         $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(0));
         $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(1));
+        $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(2));
     }
 
     public function testCompleteExistingDefinition()
@@ -317,13 +318,21 @@ interface EInterface extends DInterface
 {
 }
 
-class F implements EInterface
+interface IInterface
+{
+}
+
+class I implements IInterface
+{
+}
+
+class F extends I implements EInterface
 {
 }
 
 class G
 {
-    public function __construct(DInterface $d, EInterface $e)
+    public function __construct(DInterface $d, EInterface $e, IInterface $i)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,10 @@ public function testProcessAutowireInterface()`
`61`	`61`	`$pass = new AutowirePass();`
`62`	`62`	`$pass->process($container);`
`63`	`63`
`64`		`- $this->assertCount(2, $container->getDefinition('g')->getArguments());`
	`64`	`+ $this->assertCount(3, $container->getDefinition('g')->getArguments());`
`65`	`65`	`$this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(0));`
`66`	`66`	`$this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(1));`
	`67`	`+ $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(2));`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`public function testCompleteExistingDefinition()`
`@@ -317,13 +318,21 @@ interface EInterface extends DInterface`
`317`	`318`	`{`
`318`	`319`	`}`
`319`	`320`
`320`		`-class F implements EInterface`
	`321`	`+interface IInterface`
	`322`	`+{`
	`323`	`+}`
	`324`	`+`
	`325`	`+class I implements IInterface`
	`326`	`+{`
	`327`	`+}`
	`328`	`+`
	`329`	`+class F extends I implements EInterface`
`321`	`330`	`{`
`322`	`331`	`}`
`323`	`332`
`324`	`333`	`class G`
`325`	`334`	`{`
`326`		`- public function __construct(DInterface $d, EInterface $e)`
	`335`	`+ public function __construct(DInterface $d, EInterface $e, IInterface $i)`
`327`	`336`	`{`
`328`	`337`	`}`
`329`	`338`	`}`