bug #48273 [HttpKernel] Fix message for unresovable arguments of invokable controllers (fancyweb)

fabpot · fabpot · commit 51cdc3a1b71c · 2022-11-22T08:12:55.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Fix message for unresovable arguments of invokable controllers | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Before: ``` Could not resolve argument $logger of "app\controller\foocontroller()", maybe you ... ``` After: ``` Could not resolve argument $logger of "App\Controller\FooController::__invoke()", maybe you ... ``` Commits ------- a379c35 [HttpKernel] Fix message for unresovable arguments of invokable controllers
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
@@ -69,8 +69,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
         }
 
         if (!$this->container->has($controller)) {
-            $i = strrpos($controller, ':');
-            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+            $controller = (false !== $i = strrpos($controller, ':'))
+                ? substr($controller, 0, $i).strtolower(substr($controller, $i))
+                : $controller.'::__invoke';
         }
 
         $what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
@@ -98,6 +98,17 @@ public function testControllerNameIsAnArray()
         $resolver->resolve($request, $argument);
     }
 
+    public function testInvokableController()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::__invoke()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
+        $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
+        $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
+        $request = $this->requestWithAttributes(['_controller' => 'App\Controller\Mine']);
+        $this->assertTrue($resolver->supports($request, $argument));
+        $resolver->resolve($request, $argument);
+    }
+
     private function requestWithAttributes(array $attributes)
     {
         $request = Request::create('/');

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (!$this->container->has($controller)) {`
`72`		`- $i = strrpos($controller, ':');`
`73`		`- $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));`
	`72`	`+ $controller = (false !== $i = strrpos($controller, ':'))`
	`73`	`+ ? substr($controller, 0, $i).strtolower(substr($controller, $i))`
	`74`	`+ : $controller.'::__invoke';`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`$what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);`