Don’t try to wire Response argument with controller.service_arguments

MatTheCat · MatTheCat · commit 494f812190ef · 2022-11-09T12:05:32.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -22,6 +22,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\VarExporter\ProxyHelper;
 
@@ -151,7 +152,7 @@ public function process(ContainerBuilder $container)
                         $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                     }
 
-                    if (Request::class === $type || SessionInterface::class === $type) {
+                    if (Request::class === $type || SessionInterface::class === $type || Response::class === $type) {
                         continue;
                     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -24,6 +24,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Suit;
 
@@ -477,6 +478,20 @@ public function testAutowireAttribute()
         $this->assertSame('@bar', $locator->get('escapedRawValue'));
         $this->assertFalse($locator->has('service2'));
     }
+
+    public function testResponseArgumentIsIgnored()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service', 'stdClass')->addArgument([]);
+
+        $container->register('foo', WithResponseArgument::class)
+            ->addTag('controller.service_arguments');
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty(array_keys($locator), 'Response typed argument is ignored');
+    }
 }
 
 class RegisterTestController
@@ -580,3 +595,10 @@ public function fooAction(
     ) {
     }
 }
+
+class WithResponseArgument
+{
+    public function fooAction(Response $response, ?Response $nullableResponse)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`use Symfony\Component\DependencyInjection\Reference;`
`23`	`23`	`use Symfony\Component\DependencyInjection\TypedReference;`
`24`	`24`	`use Symfony\Component\HttpFoundation\Request;`
	`25`	`+use Symfony\Component\HttpFoundation\Response;`
`25`	`26`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`26`	`27`	`use Symfony\Component\VarExporter\ProxyHelper;`
`27`	`28`
`@@ -151,7 +152,7 @@ public function process(ContainerBuilder $container)`
`151`	`152`	`$invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;`
`152`	`153`	`}`
`153`	`154`
`154`		`- if (Request::class === $type \|\| SessionInterface::class === $type) {`
	`155`	`+ if (Request::class === $type \|\| SessionInterface::class === $type \|\| Response::class === $type) {`
`155`	`156`	`continue;`
`156`	`157`	`}`
`157`	`158`