fix: error with reference, add ID in exception message

GaryPEGEOT · GaryPEGEOT · commit 65259c968d72 · 2025-07-23T15:02:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckServiceClassExistsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckServiceClassExistsPass.php
@@ -15,6 +15,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\IncorrectServiceClassException;
+use Symfony\Component\DependencyInjection\Reference;
 
 class CheckServiceClassExistsPass implements CompilerPassInterface
 {
@@ -26,7 +27,7 @@ public function process(ContainerBuilder $container): void
             }
 
             if ($factory = $definition->getFactory()) {
-                $this->checkFactory($container, $factory);
+                $this->checkFactory($container, $factory, $id);
                 continue;
             }
 
@@ -45,14 +46,18 @@ public function process(ContainerBuilder $container): void
         }
     }
 
-    private function checkFactory(ContainerBuilder $container, array|string $factory): void
+    private function checkFactory(ContainerBuilder $container, array|string $factory, string $id): void
     {
+        if (\is_array($factory) && $factory[0] instanceof Reference && $container->hasDefinition((string) $factory[0])) {
+            return;
+        }
+
         $factory = \is_array($factory) ? array_map('strval', $factory) : $container->getParameterBag()->resolveValue($factory);
 
         try {
             \Closure::fromCallable($factory);
         } catch (\TypeError) {
-            throw new IncorrectServiceClassException(\sprintf('Factory "%s" is invalid, please check for typos.', \is_string($factory) ? $factory : implode('::', $factory)));
+            throw new IncorrectServiceClassException(\sprintf('Factory "%s" for service "%s" is invalid, please check for typos.', \is_string($factory) ? $factory : implode('::', $factory), $id));
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckServiceClassExistsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckServiceClassExistsPassTest.php
@@ -48,7 +48,7 @@ public function testProcessParameterClass()
     public function testProcessWithFactory()
     {
         $this->expectException(IncorrectServiceClassException::class);
-        $this->expectExceptionMessage('Factory "My\MissingClass::create" is invalid, please check for typos.');
+        $this->expectExceptionMessage('Factory "My\MissingClass::create" for service "foo" is invalid, please check for typos.');
 
         $container = new ContainerBuilder();
         $container->register('foo')->setFactory([new Reference('My\MissingClass'), 'create']);

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`17`	`17`	`use Symfony\Component\DependencyInjection\Exception\IncorrectServiceClassException;`
	`18`	`+use Symfony\Component\DependencyInjection\Reference;`
`18`	`19`
`19`	`20`	`class CheckServiceClassExistsPass implements CompilerPassInterface`
`20`	`21`	`{`
`@@ -26,7 +27,7 @@ public function process(ContainerBuilder $container): void`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`if ($factory = $definition->getFactory()) {`
`29`		`- $this->checkFactory($container, $factory);`
	`30`	`+ $this->checkFactory($container, $factory, $id);`
`30`	`31`	`continue;`
`31`	`32`	`}`
`32`	`33`
`@@ -45,14 +46,18 @@ public function process(ContainerBuilder $container): void`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
`48`		`- private function checkFactory(ContainerBuilder $container, array\|string $factory): void`
	`49`	`+ private function checkFactory(ContainerBuilder $container, array\|string $factory, string $id): void`
`49`	`50`	`{`
	`51`	`+ if (\is_array($factory) && $factory[0] instanceof Reference && $container->hasDefinition((string) $factory[0])) {`
	`52`	`+ return;`
	`53`	`+ }`
	`54`	`+`
`50`	`55`	`$factory = \is_array($factory) ? array_map('strval', $factory) : $container->getParameterBag()->resolveValue($factory);`
`51`	`56`
`52`	`57`	`try {`
`53`	`58`	`\Closure::fromCallable($factory);`
`54`	`59`	`} catch (\TypeError) {`
`55`		`- throw new IncorrectServiceClassException(\sprintf('Factory "%s" is invalid, please check for typos.', \is_string($factory) ? $factory : implode('::', $factory)));`
	`60`	`+ throw new IncorrectServiceClassException(\sprintf('Factory "%s" for service "%s" is invalid, please check for typos.', \is_string($factory) ? $factory : implode('::', $factory), $id));`
`56`	`61`	`}`
`57`	`62`	`}`
`58`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testProcessParameterClass()`
`48`	`48`	`public function testProcessWithFactory()`
`49`	`49`	`{`
`50`	`50`	`$this->expectException(IncorrectServiceClassException::class);`
`51`		`- $this->expectExceptionMessage('Factory "My\MissingClass::create" is invalid, please check for typos.');`
	`51`	`+ $this->expectExceptionMessage('Factory "My\MissingClass::create" for service "foo" is invalid, please check for typos.');`
`52`	`52`
`53`	`53`	`$container = new ContainerBuilder();`
`54`	`54`	`$container->register('foo')->setFactory([new Reference('My\MissingClass'), 'create']);`