diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpKernel] trim the leading backslash in the controller init

Browse Source
This commit is contained in:
Amrouche Hamza 2019-07-14 17:05:44 +02:00 committed by Fabien Potencier
parent ece1532f27
commit 6fdf2527d6
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
View File

@ -47,6 +47,8 @@ class ContainerControllerResolver extends ControllerResolver
*/ */
protected function instantiateController($class) protected function instantiateController($class)
{ {
$class = ltrim($class, '\\');
if ($this->container->has($class)) { if ($this->container->has($class)) {
return $this->container->get($class); return $this->container->get($class);
} }

23
src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
View File

@ -38,6 +38,18 @@ class ControllerResolverTest extends TestCase
$this->assertSame($lambda, $controller); $this->assertSame($lambda, $controller);
} }
public function testGetControllerWithStartingBackslash()
{
$resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', '\\'.ControllerTest::class.'::publicAction');
$controller = $resolver->getController($request);
$this->assertInstanceOf(ControllerTest::class, $controller[0]);
$this->assertSame('publicAction', $controller[1]);
}
public function testGetControllerWithObjectAndInvokeMethod() public function testGetControllerWithObjectAndInvokeMethod()
{ {
$resolver = $this->createControllerResolver(); $resolver = $this->createControllerResolver();
@ -71,6 +83,17 @@ class ControllerResolverTest extends TestCase
$this->assertSame('publicAction', $controller[1]); $this->assertSame('publicAction', $controller[1]);
} }
public function testGetControllerWithClassAndMethodAsArrayWithBackslash()
{
$resolver = $this->createControllerResolver();
$request = Request::create('/');
$request->attributes->set('_controller', ['\\'.ControllerTest::class, 'publicAction']);
$controller = $resolver->getController($request);
$this->assertInstanceOf(ControllerTest::class, $controller[0]);
$this->assertSame('publicAction', $controller[1]);
}
public function testGetControllerWithClassAndMethodAsString() public function testGetControllerWithClassAndMethodAsString()
{ {
$resolver = $this->createControllerResolver(); $resolver = $this->createControllerResolver();