diff --git a/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
index d4971cc1a5..48ea6e742d 100644
--- a/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
+++ b/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/Kernel.php b/Kernel.php
index 54ea465379..be36bc6346 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,11 +76,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private static $freshCache = [];
- public const VERSION = '4.4.48';
- public const VERSION_ID = 40448;
+ public const VERSION = '4.4.49';
+ public const VERSION_ID = 40449;
public const MAJOR_VERSION = 4;
public const MINOR_VERSION = 4;
- public const RELEASE_VERSION = 48;
+ public const RELEASE_VERSION = 49;
public const EXTRA_VERSION = '';
public const END_OF_MAINTENANCE = '11/2022';
diff --git a/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php b/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
index 3cf2f0f185..4577b5a6d2 100644
--- a/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
+++ b/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('/');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy