[DI] Always consider abstract getters as autowiring candidates

nicolas-grekas · nicolas-grekas · commit 8f246bde1d0d · 2017-02-14T16:19:09.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -159,6 +159,10 @@ private function getMethodsToAutowire(\ReflectionClass $reflectionClass, array $
                     continue 2;
                 }
             }
+
+            if ($reflectionMethod->isAbstract() && !$reflectionMethod->getNumberOfParameters()) {
+                $methodsToAutowire[strtolower($reflectionMethod->name)] = $reflectionMethod;
+            }
         }
 
         if ($notFound = array_diff($autowiredMethods, $found)) {
@@ -478,7 +482,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint)
         $this->populateAvailableType($argumentId, $argumentDefinition);
 
         try {
-            $this->processValue($argumentDefinition, true);
+            $this->processValue($argumentDefinition);
             $this->currentId = $currentId;
         } catch (RuntimeException $e) {
             $classOrInterface = $typeHint->isInterface() ? 'interface' : 'class';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AbstractGetterOverriding;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\GetterOverriding;
 
@@ -517,6 +518,27 @@ public function testExplicitMethodInjection()
         );
     }
 
+    /**
+     * @requires PHP 7.0
+     */
+    public function testAbstractGetterOverriding()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('getter_overriding', AbstractGetterOverriding::class)
+            ->setAutowired(true)
+        ;
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $overridenGetters = $container->getDefinition('getter_overriding')->getOverriddenGetters();
+        $this->assertEquals(array(
+            'abstractgetfoo' => new Reference('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Foo'),
+        ), $overridenGetters);
+    }
+
     /**
      * @requires PHP 7.1
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractGetterOverriding.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractGetterOverriding.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+
+abstract class AbstractGetterOverriding
+{
+    abstract public function abstractGetFoo(): Foo;
+    abstract public function abstractDoFoo($arg = null): Foo;
+}

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,10 @@ private function getMethodsToAutowire(\ReflectionClass $reflectionClass, array $`
`159`	`159`	`continue 2;`
`160`	`160`	`}`
`161`	`161`	`}`
	`162`	`+`
	`163`	`+ if ($reflectionMethod->isAbstract() && !$reflectionMethod->getNumberOfParameters()) {`
	`164`	`+ $methodsToAutowire[strtolower($reflectionMethod->name)] = $reflectionMethod;`
	`165`	`+ }`
`162`	`166`	`}`
`163`	`167`
`164`	`168`	`if ($notFound = array_diff($autowiredMethods, $found)) {`
`@@ -478,7 +482,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint)`
`478`	`482`	`$this->populateAvailableType($argumentId, $argumentDefinition);`
`479`	`483`
`480`	`484`	`try {`
`481`		`- $this->processValue($argumentDefinition, true);`
	`485`	`+ $this->processValue($argumentDefinition);`
`482`	`486`	`$this->currentId = $currentId;`
`483`	`487`	`} catch (RuntimeException $e) {`
`484`	`488`	`$classOrInterface = $typeHint->isInterface() ? 'interface' : 'class';`