From fc3d3bbf60617be6f76b8463ac6f24755d15d107 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 14 Nov 2017 23:29:28 +0200 Subject: [PATCH] [HttpKernel] Fix service arg resolver for controllers as array callables --- .../ArgumentResolver/ServiceValueResolver.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php index b1da6a9a75..c55564c046 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php @@ -35,7 +35,13 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface */ public function supports(Request $request, ArgumentMetadata $argument) { - return is_string($controller = $request->attributes->get('_controller')) && $this->container->has($controller) && $this->container->get($controller)->has($argument->getName()); + $controller = $request->attributes->get('_controller'); + + if (\is_array($controller) && \is_callable($controller, true) && \is_string($controller[0])) { + $controller = $controller[0].'::'.$controller[1]; + } + + return \is_string($controller) && $this->container->has($controller) && $this->container->get($controller)->has($argument->getName()); } /** @@ -43,6 +49,10 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface */ public function resolve(Request $request, ArgumentMetadata $argument) { - yield $this->container->get($request->attributes->get('_controller'))->get($argument->getName()); + if (\is_array($controller = $request->attributes->get('_controller'))) { + $controller = $controller[0].'::'.$controller[1]; + } + + yield $this->container->get($controller)->get($argument->getName()); } }