[DependencyInjection] Always autowire the constructor

dunglas · dunglas · commit 3dc98ce4c3b4 · 2017-01-16T16:20:27.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -120,14 +120,22 @@ private function completeDefinition($id, Definition $definition, array $autowire
      *
      * @param string           $id
      * @param \ReflectionClass $reflectionClass
-     * @param string[]         $autowiredMethods
+     * @param string[]         $configuredAutowiredMethods
      *
      * @return \ReflectionMethod[]
      */
-    private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $autowiredMethods)
+    private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $configuredAutowiredMethods)
     {
         $found = array();
         $regexList = array();
+
+        // Always try to autowire the constructor
+        if (in_array('__construct', $configuredAutowiredMethods, true)) {
+            $autowiredMethods = $configuredAutowiredMethods;
+        } else {
+            $autowiredMethods =  array_merge(array('__construct'), $configuredAutowiredMethods);
+        }
+
         foreach ($autowiredMethods as $pattern) {
             $regexList[] = '/^'.str_replace('\*', '.*', preg_quote($pattern, '/')).'$/i';
         }
@@ -147,7 +155,7 @@ private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, ar
             }
         }
 
-        if ($notFound = array_diff($autowiredMethods, $found)) {
+        if ($notFound = array_diff($configuredAutowiredMethods, $found)) {
             $compiler = $this->container->getCompiler();
             $compiler->addLogMessage($compiler->getLoggingFormatter()->formatUnusedAutowiringPatterns($this, $id, $notFound));
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -440,7 +440,7 @@ public function testSetterInjection()
         // manually configure *one* call, to override autowiring
         $container
             ->register('setter_injection', SetterInjection::class)
-            ->setAutowiredMethods(array('__construct', 'set*'))
+            ->setAutowiredMethods(array('set*'))
             ->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'))
         ;
 
@@ -557,7 +557,7 @@ public function testSetterInjectionCollisionThrowsException()
         $container->register('c1', CollisionA::class);
         $container->register('c2', CollisionB::class);
         $aDefinition = $container->register('setter_injection_collision', SetterInjectionCollision::class);
-        $aDefinition->setAutowiredMethods(array('__construct', 'set*'));
+        $aDefinition->setAutowiredMethods(array('set*'));
 
         $pass = new AutowirePass();
         $pass->process($container);

Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,22 @@ private function completeDefinition($id, Definition $definition, array $autowire`
`120`	`120`	`*`
`121`	`121`	`* @param string $id`
`122`	`122`	`* @param \ReflectionClass $reflectionClass`
`123`		`- * @param string[] $autowiredMethods`
	`123`	`+ * @param string[] $configuredAutowiredMethods`
`124`	`124`	`*`
`125`	`125`	`* @return \ReflectionMethod[]`
`126`	`126`	`*/`
`127`		`- private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $autowiredMethods)`
	`127`	`+ private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $configuredAutowiredMethods)`
`128`	`128`	`{`
`129`	`129`	`$found = array();`
`130`	`130`	`$regexList = array();`
	`131`	`+`
	`132`	`+ // Always try to autowire the constructor`
	`133`	`+ if (in_array('__construct', $configuredAutowiredMethods, true)) {`
	`134`	`+ $autowiredMethods = $configuredAutowiredMethods;`
	`135`	`+ } else {`
	`136`	`+ $autowiredMethods = array_merge(array('__construct'), $configuredAutowiredMethods);`
	`137`	`+ }`
	`138`	`+`
`131`	`139`	`foreach ($autowiredMethods as $pattern) {`
`132`	`140`	`$regexList[] = '/^'.str_replace('\', '.', preg_quote($pattern, '/')).'$/i';`
`133`	`141`	`}`
`@@ -147,7 +155,7 @@ private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, ar`
`147`	`155`	`}`
`148`	`156`	`}`
`149`	`157`
`150`		`- if ($notFound = array_diff($autowiredMethods, $found)) {`
	`158`	`+ if ($notFound = array_diff($configuredAutowiredMethods, $found)) {`
`151`	`159`	`$compiler = $this->container->getCompiler();`
`152`	`160`	`$compiler->addLogMessage($compiler->getLoggingFormatter()->formatUnusedAutowiringPatterns($this, $id, $notFound));`
`153`	`161`	`}`