Merge branch '4.3' into 4.4

fabpot · fabpot · commit 8c91e7e48aaa · 2019-08-09T14:17:13.000+02:00
* 4.3:
  [HttpKernel] fixed class having a leading \ in a route controller
  [HttpKernel] trim the leading backslash in the controller init
diff --git a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
@@ -47,6 +47,8 @@ protected function createController($controller)
      */
     protected function instantiateController($class)
     {
+        $class = ltrim($class, '\\');
+
         if ($this->container->has($class)) {
             return $this->container->get($class);
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -119,6 +119,36 @@ public function testGetControllerInvokableServiceWithClassNameAsName()
         $this->assertSame($service, $controller);
     }
 
+    /**
+     * @dataProvider getControllers
+     */
+    public function testInstantiateControllerWhenControllerStartsWithABackslash($controller)
+    {
+        $service = new ControllerTestService('foo');
+        $class = ControllerTestService::class;
+
+        $container = $this->createMockContainer();
+        $container->expects($this->once())->method('has')->with($class)->willReturn(true);
+        $container->expects($this->once())->method('get')->with($class)->willReturn($service);
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $controller);
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf(ControllerTestService::class, $controller[0]);
+        $this->assertSame('action', $controller[1]);
+    }
+
+    public function getControllers()
+    {
+        return [
+            ['\\'.ControllerTestService::class.'::action'],
+            ['\\'.ControllerTestService::class.':action'],
+        ];
+    }
+
     public function testExceptionWhenUsingRemovedControllerServiceWithClassNameAsName()
     {
         $this->expectException('InvalidArgumentException');

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ protected function createController($controller)`
`47`	`47`	`*/`
`48`	`48`	`protected function instantiateController($class)`
`49`	`49`	`{`
	`50`	`+ $class = ltrim($class, '\\');`
	`51`	`+`
`50`	`52`	`if ($this->container->has($class)) {`
`51`	`53`	`return $this->container->get($class);`
`52`	`54`	`}`