Skip to content

Commit

Permalink
made parsing controllers more robust
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabpot
fabpot committed Mar 27, 2014
1 parent e4ff8ae commit 6dba229
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 33 deletions.
12 changes: 10 additions & 2 deletions src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
View file
Expand Up @@ -64,10 +64,18 @@ public function getController(Request $request)
return false;
}

if (is_array($controller) || (is_object($controller) && method_exists($controller, '__invoke'))) {
if (is_array($controller)) {
return $controller;
}

if (is_object($controller)) {
if (method_exists($controller, '__invoke')) {
return $controller;
}

throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', get_class($controller), $request->getPathInfo()));
}

if (false === strpos($controller, ':')) {
if (method_exists($controller, '__invoke')) {
return new $controller();
Expand All @@ -79,7 +87,7 @@ public function getController(Request $request)
$callable = $this->createController($controller);

if (!is_callable($callable)) {
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable.', $request->getPathInfo()));
throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', $controller, $request->getPathInfo()));
}

return $callable;
Expand Down
115 changes: 84 additions & 31 deletions src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
View file
Expand Up @@ -24,66 +24,119 @@ protected function setUp()
}
}

public function testGetController()
public function testGetControllerWithoutControllerParameter()
{
$logger = new Logger();
$logger = $this->getMock('Psr\Log\LoggerInterface');
$logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing');
$resolver = new ControllerResolver($logger);

$request = Request::create('/');
$this->assertFalse($resolver->getController($request), '->getController() returns false when the request has no _controller attribute');
$this->assertEquals(array('Unable to look for the controller as the "_controller" parameter is missing'), $logger->getLogs('warning'));
}

$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::testGetController');
$controller = $resolver->getController($request);
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller[0], '->getController() returns a PHP callable');
public function testGetControllerWithLambda()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', $lambda = function () {});
$controller = $resolver->getController($request);
$this->assertSame($lambda, $controller);
}

public function testGetControllerWithObjectAndInvokeMethod()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', $this);
$controller = $resolver->getController($request);
$this->assertSame($this, $controller);
}

$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest');
$controller = $resolver->getController($request);
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
public function testGetControllerWithObjectAndMethod()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', array($this, 'controllerMethod1'));
$controller = $resolver->getController($request);
$this->assertSame(array($this, 'controllerMethod1'), $controller);
}

public function testGetControllerWithClassAndMethod()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'));
$controller = $resolver->getController($request);
$this->assertSame(array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'), $controller);
}

public function testGetControllerWithObjectAndMethodAsString()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod1');
$controller = $resolver->getController($request);
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller[0], '->getController() returns a PHP callable');
}

public function testGetControllerWithClassAndInvokeMethod()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest');
$controller = $resolver->getController($request);
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
}

/**
* @expectedException \InvalidArgumentException
*/
public function testGetControllerOnObjectWithoutInvokeMethod()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', new \stdClass());
$resolver->getController($request);
}

public function testGetControllerWithFunction()
{
$resolver = new ControllerResolver();

$request = Request::create('/');
$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function');
$controller = $resolver->getController($request);
$this->assertSame('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function', $controller);
}

$request->attributes->set('_controller', 'foo');
try {
$resolver->getController($request);
$this->fail('->getController() throws an \InvalidArgumentException if the _controller attribute is not well-formatted');
} catch (\Exception $e) {
$this->assertInstanceOf('\InvalidArgumentException', $e, '->getController() throws an \InvalidArgumentException if the _controller attribute is not well-formatted');
}
/**
* @dataProvider getUndefinedControllers
* @expectedException \InvalidArgumentException
*/
public function testGetControllerOnNonUndefinedFunction($controller)
{
$resolver = new ControllerResolver();

$request->attributes->set('_controller', 'foo::bar');
try {
$resolver->getController($request);
$this->fail('->getController() throws an \InvalidArgumentException if the _controller attribute contains a non-existent class');
} catch (\Exception $e) {
$this->assertInstanceOf('\InvalidArgumentException', $e, '->getController() throws an \InvalidArgumentException if the _controller attribute contains a non-existent class');
}
$request = Request::create('/');
$request->attributes->set('_controller', $controller);
$resolver->getController($request);
}

$request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar');
try {
$resolver->getController($request);
$this->fail('->getController() throws an \InvalidArgumentException if the _controller attribute contains a non-existent method');
} catch (\Exception $e) {
$this->assertInstanceOf('\InvalidArgumentException', $e, '->getController() throws an \InvalidArgumentException if the _controller attribute contains a non-existent method');
}
public function getUndefinedControllers()
{
return array(
array('foo'),
array('foo::bar'),
array('stdClass'),
array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar'),
);
}

public function testGetArguments()
Expand Down Expand Up @@ -165,7 +218,7 @@ public function __invoke($foo, $bar = null)
{
}

protected function controllerMethod1($foo)
public function controllerMethod1($foo)
{
}

Expand Down

0 comments on commit 6dba229

Please sign in to comment.