Test the suggestion of already registered services

sroze · sroze · commit 407f132e43b3 · 2017-11-30T11:00:15.000Z
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -336,14 +336,16 @@ private function createTypeAlternatives(TypedReference $reference)
         if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
             return ' '.$message;
         }
-        if (isset($this->ambiguousServiceTypes[$type])) {
+
+        $servicesAndAliases = $this->container->getServiceIds();
+        if (!$this->container->has($type) && false !== $key = array_search(strtolower($type), array_map('strtolower', $servicesAndAliases))) {
+            return sprintf(' Did you mean "%s"?', $servicesAndAliases[$key]);
+        } elseif (isset($this->ambiguousServiceTypes[$type])) {
             $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.';
-        } elseif (is_array($this->types) && (null !== $key = array_search(strtolower($type), array_map('strtolower', $this->types)))) {
-            return sprintf(' Maybe you mean %s instead of %s ?', $key, $type);
         } else {
             return;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -685,6 +685,24 @@ public function provideNotWireableCalls()
         );
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessage Cannot autowire service "foo": argument "$sam" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireableBecauseOfATypo()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\lesTilleuls" but no such service exists. Did you mean "Symfony\Component\DependencyInjection\Tests\Compiler\LesTilleuls"?
+     */
+    public function testSuggestRegisteredServicesWithSimilarCase()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(LesTilleuls::class, LesTilleuls::class);
+        $container->register('foo', NotWireable::class)->setAutowired(true)
+            ->addMethodCall('setNotAutowireableBecauseOfATypo', array())
+        ;
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
      * @expectedExceptionMessage Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -6,13 +6,6 @@ class Foo
 {
 }
 
-class FooFoo
-{
-    public function __construct(Foo $foo)
-    {
-    }
-}
-
 class Bar
 {
     public function __construct(Foo $foo)
@@ -300,23 +293,16 @@ public function setChildMethodWithoutDocBlock(A $a)
     }
 }
 
-class ARealClass {
-
-}
-
-class ClassMisMatch {
-
-    public function __construct(arealclass $n = null)
-    {
-    }
-}
-
 class NotWireable
 {
     public function setNotAutowireable(NotARealClass $n)
     {
     }
 
+    public function setNotAutowireableBecauseOfATypo(lesTilleuls $sam)
+    {
+    }
+
     public function setBar()
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,6 @@ class Foo`
`6`	`6`	`{`
`7`	`7`	`}`
`8`	`8`
`9`		`-class FooFoo`
`10`		`-{`
`11`		`- public function __construct(Foo $foo)`
`12`		`- {`
`13`		`- }`
`14`		`-}`
`15`		`-`
`16`	`9`	`class Bar`
`17`	`10`	`{`
`18`	`11`	`public function __construct(Foo $foo)`
`@@ -300,23 +293,16 @@ public function setChildMethodWithoutDocBlock(A $a)`
`300`	`293`	`}`
`301`	`294`	`}`
`302`	`295`
`303`		`-class ARealClass {`
`304`		`-`
`305`		`-}`
`306`		`-`
`307`		`-class ClassMisMatch {`
`308`		`-`
`309`		`- public function __construct(arealclass $n = null)`
`310`		`- {`
`311`		`- }`
`312`		`-}`
`313`		`-`
`314`	`296`	`class NotWireable`
`315`	`297`	`{`
`316`	`298`	`public function setNotAutowireable(NotARealClass $n)`
`317`	`299`	`{`
`318`	`300`	`}`
`319`	`301`
	`302`	`+ public function setNotAutowireableBecauseOfATypo(lesTilleuls $sam)`
	`303`	`+ {`
	`304`	`+ }`
	`305`	`+`
`320`	`306`	`public function setBar()`
`321`	`307`	`{`
`322`	`308`	`}`