[DI] Show the right class autowired when providing a non-existing class in constructor

Simperfit · Simperfit · commit 36a9a6ac044f · 2019-06-14T10:37:16.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -379,13 +379,14 @@ private function createTypeNotFoundMessageCallback(TypedReference $reference, $l
         $container->setAliases($this->container->getAliases());
         $container->setDefinitions($this->container->getDefinitions());
         $container->setResourceTracking(false);
+        $currentId = $this->currentId;
 
-        return function () use ($container, $reference, $label) {
-            return $this->createTypeNotFoundMessage($container, $reference, $label);
+        return function () use ($container, $reference, $label, $currentId) {
+            return $this->createTypeNotFoundMessage($container, $reference, $label, $currentId);
         };
     }
 
-    private function createTypeNotFoundMessage(ContainerBuilder $container, TypedReference $reference, $label)
+    private function createTypeNotFoundMessage(ContainerBuilder $container, TypedReference $reference, $label, string $currentId)
     {
         if (!$r = $container->getReflectionClass($type = $reference->getType(), false)) {
             // either $type does not exist or a parent class does not exist
@@ -409,7 +410,7 @@ private function createTypeNotFoundMessage(ContainerBuilder $container, TypedRef
             }
         }
 
-        $message = sprintf('Cannot autowire service "%s": %s %s', $this->currentId, $label, $message);
+        $message = sprintf('Cannot autowire service "%s": %s %s', $currentId, $label, $message);
 
         if (null !== $this->lastFailure) {
             $message = $this->lastFailure."\n".$message;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -50,6 +50,22 @@ public function testProcess()
         $this->assertEquals(Foo::class, (string) $container->getDefinition('bar')->getArgument(0));
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessage Cannot autowire service "Symfony\Component\DependencyInjection\Tests\CompilerEslaAction": argument "$notExisting" of method "Symfony\Component\DependencyInjection\Tests\Compiler\ElsaAction::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotExisting" but this class was not found.
+     */
+    public function testProcessNotExisintActionParam()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(Foo::class);
+        $barDefinition = $container->register(__NAMESPACE__.'EslaAction', __NAMESPACE__.'\ElsaAction');
+        $barDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
     public function testProcessVariadic()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -419,3 +419,10 @@ public function __construct(LoggerInterface $logger, DecoratorInterface $decorat
     {
     }
 }
+
+final class ElsaAction
+{
+    public function __construct(NotExisting $notExisting)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -379,13 +379,14 @@ private function createTypeNotFoundMessageCallback(TypedReference $reference, $l`
`379`	`379`	`$container->setAliases($this->container->getAliases());`
`380`	`380`	`$container->setDefinitions($this->container->getDefinitions());`
`381`	`381`	`$container->setResourceTracking(false);`
	`382`	`+ $currentId = $this->currentId;`
`382`	`383`
`383`		`- return function () use ($container, $reference, $label) {`
`384`		`- return $this->createTypeNotFoundMessage($container, $reference, $label);`
	`384`	`+ return function () use ($container, $reference, $label, $currentId) {`
	`385`	`+ return $this->createTypeNotFoundMessage($container, $reference, $label, $currentId);`
`385`	`386`	`};`
`386`	`387`	`}`
`387`	`388`
`388`		`- private function createTypeNotFoundMessage(ContainerBuilder $container, TypedReference $reference, $label)`
	`389`	`+ private function createTypeNotFoundMessage(ContainerBuilder $container, TypedReference $reference, $label, string $currentId)`
`389`	`390`	`{`
`390`	`391`	`if (!$r = $container->getReflectionClass($type = $reference->getType(), false)) {`
`391`	`392`	`// either $type does not exist or a parent class does not exist`
`@@ -409,7 +410,7 @@ private function createTypeNotFoundMessage(ContainerBuilder $container, TypedRef`
`409`	`410`	`}`
`410`	`411`	`}`
`411`	`412`
`412`		`- $message = sprintf('Cannot autowire service "%s": %s %s', $this->currentId, $label, $message);`
	`413`	`+ $message = sprintf('Cannot autowire service "%s": %s %s', $currentId, $label, $message);`
`413`	`414`
`414`	`415`	`if (null !== $this->lastFailure) {`
`415`	`416`	`$message = $this->lastFailure."\n".$message;`
Original file line number	Diff line number	Diff line change
`@@ -419,3 +419,10 @@ public function __construct(LoggerInterface $logger, DecoratorInterface $decorat`
`419`	`419`	`{`
`420`	`420`	`}`
`421`	`421`	`}`
	`422`	`+`
	`423`	`+final class ElsaAction`
	`424`	`+{`
	`425`	`+ public function __construct(NotExisting $notExisting)`
	`426`	`+ {`
	`427`	`+ }`
	`428`	`+}`