[DI] Cleanup remaings from autoregistration

nicolas-grekas · nicolas-grekas · commit 3d5a11109644 · 2018-03-22T11:00:28.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -29,7 +29,6 @@ class AutowirePass extends AbstractRecursivePass
 {
     private $types;
     private $ambiguousServiceTypes = array();
-    private $autowired = array();
     private $lastFailure;
     private $throwOnAutowiringException;
 
@@ -48,7 +47,6 @@ public function process(ContainerBuilder $container)
         } finally {
             $this->types = null;
             $this->ambiguousServiceTypes = array();
-            $this->autowired = array();
         }
     }
 
@@ -232,22 +230,6 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
         if ($type !== (string) $reference || ($this->container->has($type) && !$this->container->findDefinition($type)->isAbstract())) {
             return $reference;
         }
-
-        if (!$reference->canBeAutoregistered()) {
-            return;
-        }
-
-        if (null === $this->types) {
-            $this->populateAvailableTypes();
-        }
-
-        if (isset($this->types[$type]) || isset($this->ambiguousServiceTypes[$type])) {
-            return;
-        }
-
-        if (isset($this->autowired[$type])) {
-            return $this->autowired[$type] ? new TypedReference($this->autowired[$type], $type) : null;
-        }
     }
 
     /**
@@ -351,6 +333,9 @@ private function createTypeAlternatives(TypedReference $reference)
         if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
             return ' '.$message;
         }
+        if (null === $this->types) {
+            $this->populateAvailableTypes();
+        }
 
         $servicesAndAliases = $this->container->getServiceIds();
         if (!$this->container->has($type) && false !== $key = array_search(strtolower($type), array_map('strtolower', $servicesAndAliases))) {
@@ -359,8 +344,6 @@ private function createTypeAlternatives(TypedReference $reference)
             $message = sprintf('one of these existing services: "%s"', implode('", "', $this->ambiguousServiceTypes[$type]));
         } elseif (isset($this->types[$type])) {
             $message = sprintf('the existing "%s" service', $this->types[$type]);
-        } elseif ($reference->getRequiringClass() && !$reference->canBeAutoregistered()) {
-            return ' It cannot be auto-registered because it is from a different root namespace.';
         } else {
             return;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -697,7 +697,7 @@ public function provideNotWireableCalls()
     {
         return array(
             array('setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.'),
-            array('setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists. It cannot be auto-registered because it is from a different root namespace.'),
+            array('setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists.'),
             array(null, 'Invalid service "foo": method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setProtectedMethod()" must be public.'),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ public function provideNotWireableCalls()`
`697`	`697`	`{`
`698`	`698`	`return array(`
`699`	`699`	`array('setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.'),`
`700`		`- array('setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists. It cannot be auto-registered because it is from a different root namespace.'),`
	`700`	`+ array('setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists.'),`
`701`	`701`	`array(null, 'Invalid service "foo": method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setProtectedMethod()" must be public.'),`
`702`	`702`	`);`
`703`	`703`	`}`