[HttpKernel] trim the leading backslash in the controller init
This commit is contained in:
parent
ece1532f27
commit
6fdf2527d6
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
|
Reference in New Issue
Block a user