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

merged branch fabpot/callable (PR #7739) 

This PR was merged into the master branch.

Discussion
----------

[HttpKernel] allowed any callable to be returned by ControllerResolver::createController

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

8c44768 [HttpKernel] allowed any callable to be returned by ControllerResolver::createController
This commit is contained in:
Fabien Potencier 2013-04-20 22:31:06 +02:00
parent f918fc90fe 8c447680b9
commit 898185e870
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
View File

@ -76,13 +76,13 @@ class ControllerResolver implements ControllerResolverInterface
}
}
list($controller, $method) = $this->createController($controller);
$callable = $this->createController($controller);
if (!method_exists($controller, $method)) {
throw new \InvalidArgumentException(sprintf('Method "%s::%s" does not exist.', get_class($controller), $method));
if (!is_callable($callable)) {
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable.', $request->getPathInfo()));
}
return array($controller, $method);
return $callable;
}
/**

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

@ -150,6 +150,16 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array($request), $resolver->getArguments($request, $controller), '->getArguments() injects the request');
}
public function testCreateControllerCanReturnAnyCallable()
{
$mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));
$mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\some_controller_function'));
$request = Request::create('/');
$request->attributes->set('_controller', 'foobar');
$mock->getController($request);
}
public function __invoke($foo, $bar = null)
{
}