bug #48172 [HttpKernel] Don’t try to wire Response argument with controller.service_arguments (MatTheCat)

nicolas-grekas · nicolas-grekas · commit a6718164b1c1 · 2022-11-09T12:21:17.000+01:00
This PR was submitted for the 6.2 branch but it was merged into the 5.4 branch instead. Discussion ---------- [HttpKernel] Don’t try to wire Response argument with controller.service_arguments | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48138 | License | MIT | Doc PR | N/A Commits ------- 7832d8d [HttpKernel] Don’t try to wire Response argument with controller.service_arguments
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -24,6 +24,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;
 
 /**
@@ -174,7 +175,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
@@ -23,6 +23,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;
 
@@ -447,6 +448,20 @@ public function testBindWithTarget()
         ];
         $this->assertEquals($expected, $locator->getArgument(0));
     }
+
+    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
@@ -527,3 +542,10 @@ public function fooAction(
     ) {
     }
 }
+
+class WithResponseArgument
+{
+    public function fooAction(Response $response, ?Response $nullableResponse)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`use Symfony\Component\DependencyInjection\Reference;`
`25`	`25`	`use Symfony\Component\DependencyInjection\TypedReference;`
`26`	`26`	`use Symfony\Component\HttpFoundation\Request;`
	`27`	`+use Symfony\Component\HttpFoundation\Response;`
`27`	`28`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`28`	`29`
`29`	`30`	`/**`
`@@ -174,7 +175,7 @@ public function process(ContainerBuilder $container)`
`174`	`175`	`$invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;`
`175`	`176`	`}`
`176`	`177`
`177`		`- if (Request::class === $type \|\| SessionInterface::class === $type) {`
	`178`	`+ if (Request::class === $type \|\| SessionInterface::class === $type \|\| Response::class === $type) {`
`178`	`179`	`continue;`
`179`	`180`	`}`
`180`	`181`