[HttpKernel] Make ServiceValueResolver work if controller namespace starts with a backslash in routing

mathieutu · nicolas-grekas · commit 3b47441fd5be · 2018-04-14T10:06:52.000-05:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -39,9 +39,15 @@ public function supports(Request $request, ArgumentMetadata $argument)
 
         if (\is_array($controller) && \is_callable($controller, true) && \is_string($controller[0])) {
             $controller = $controller[0].'::'.$controller[1];
+        } elseif (!\is_string($controller) || '' === $controller) {
+            return false;
         }
 
-        return \is_string($controller) && $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());
+        if ('\\' === $controller[0]) {
+            $controller = ltrim($controller, '\\');
+        }
+
+        return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());
     }
 
     /**
@@ -53,6 +59,10 @@ public function resolve(Request $request, ArgumentMetadata $argument)
             $controller = $controller[0].'::'.$controller[1];
         }
 
+        if ('\\' === $controller[0]) {
+            $controller = ltrim($controller, '\\');
+        }
+
         yield $this->container->get($controller)->get($argument->getName());
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -47,6 +47,25 @@ public function testExistingController()
         $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
     }
 
+    public function testExistingControllerWithATrailingBackSlash()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator(array(
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ));
+            },
+        )));
+
+        $request = $this->requestWithAttributes(array('_controller' => '\\App\\Controller\\Mine::method'));
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+    }
+
     public function testControllerNameIsAnArray()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator(array(

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,15 @@ public function supports(Request $request, ArgumentMetadata $argument)`
`39`	`39`
`40`	`40`	`if (\is_array($controller) && \is_callable($controller, true) && \is_string($controller[0])) {`
`41`	`41`	`$controller = $controller[0].'::'.$controller[1];`
	`42`	`+ } elseif (!\is_string($controller) \|\| '' === $controller) {`
	`43`	`+ return false;`
`42`	`44`	`}`
`43`	`45`
`44`		`- return \is_string($controller) && $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());`
	`46`	`+ if ('\\' === $controller[0]) {`
	`47`	`+ $controller = ltrim($controller, '\\');`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`/**`
`@@ -53,6 +59,10 @@ public function resolve(Request $request, ArgumentMetadata $argument)`
`53`	`59`	`$controller = $controller[0].'::'.$controller[1];`
`54`	`60`	`}`
`55`	`61`
	`62`	`+ if ('\\' === $controller[0]) {`
	`63`	`+ $controller = ltrim($controller, '\\');`
	`64`	`+ }`
	`65`	`+`
`56`	`66`	`yield $this->container->get($controller)->get($argument->getName());`
`57`	`67`	`}`
`58`	`68`	`}`