[DependencyInjection] Make the DefinitionErrorExceptionPass ignore the test container

MatTheCat · MatTheCat · commit 9f35b0352063 · 2025-05-14T19:55:36.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/Controller.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer;
+
+class Controller
+{
+    public function __invoke(DTO $dto)
+    {
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/DTO.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/DTO.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer;
+
+class DTO
+{
+    public function __construct(NestedDTO $nestedDto)
+    {
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/NestedDTO.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/NestedDTO.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer;
+
+class NestedDTO
+{
+    public function __construct(int $notAutowireable)
+    {
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
@@ -28,3 +28,12 @@ services:
         public: true
         tags:
             - kernel.reset: { method: 'myCustomName' }
+
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\NestedDTO:
+        autowire: true
+
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\DTO:
+        autowire: true
+
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\Controller:
+        tags: ['controller.service_arguments']
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
@@ -64,7 +64,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             return $value;
         }
 
-        if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {
+        if ($value instanceof Reference && 'test.private_services_locator' !== $this->currentId && $this->currentId !== $targetId = (string) $value) {
             if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
                 $this->sourceReferences[$targetId][$this->currentId] ??= true;
             } else {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed`
`64`	`64`	`return $value;`
`65`	`65`	`}`
`66`	`66`
`67`		`- if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {`
	`67`	`+ if ($value instanceof Reference && 'test.private_services_locator' !== $this->currentId && $this->currentId !== $targetId = (string) $value) {`
`68`	`68`	`if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {`
`69`	`69`	`$this->sourceReferences[$targetId][$this->currentId] ??= true;`
`70`	`70`	`} else {`