[FrameworkBundle] restricted the type of controllers that can be executed by InternalController
This commit is contained in:
parent
d90e55cbb3
commit
1f8c501b99
@ -31,6 +31,35 @@ class InternalController extends ContainerAware
|
||||
*/
|
||||
public function indexAction($path, $controller)
|
||||
{
|
||||
// safeguard
|
||||
if (!is_string($controller)) {
|
||||
throw new \RuntimeException('A Controller must be a string.');
|
||||
}
|
||||
|
||||
// check that the controller looks like a controller
|
||||
if (false === strpos($controller, '::')) {
|
||||
$count = substr_count($controller, ':');
|
||||
if (2 == $count) {
|
||||
// the convention already enforces the Controller suffix
|
||||
} elseif (1 == $count) {
|
||||
// controller in the service:method notation
|
||||
list($service, $method) = explode(':', $controller, 2);
|
||||
$class = get_class($this->container->get($service));
|
||||
|
||||
if (!preg_match('/Controller$/', $class)) {
|
||||
throw new \RuntimeException('A Controller class name must end with Controller.');
|
||||
}
|
||||
} else {
|
||||
throw new \LogicException('Unable to parse the Controller name.');
|
||||
}
|
||||
} else {
|
||||
list($class, $method) = explode('::', $controller, 2);
|
||||
|
||||
if (!preg_match('/Controller$/', $class)) {
|
||||
throw new \RuntimeException('A Controller class name must end with Controller.');
|
||||
}
|
||||
}
|
||||
|
||||
$request = $this->container->get('request');
|
||||
$attributes = $request->attributes;
|
||||
|
||||
|
@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
|
||||
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\InternalController;
|
||||
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
class InternalControllerTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException \RuntimeException
|
||||
* @expectedExceptionMessage A Controller class name must end with Controller.
|
||||
*/
|
||||
public function testWithAClassMethodController()
|
||||
{
|
||||
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
|
||||
|
||||
$controller = new InternalController();
|
||||
$controller->setContainer($container);
|
||||
|
||||
$controller->indexAction('/', 'Symfony\Component\HttpFoundation\Request::getPathInfo');
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \RuntimeException
|
||||
* @expectedExceptionMessage A Controller class name must end with Controller.
|
||||
*/
|
||||
public function testWithAServiceController()
|
||||
{
|
||||
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
|
||||
$container
|
||||
->expects($this->once())
|
||||
->method('get')
|
||||
->will($this->returnValue(new Request()))
|
||||
;
|
||||
|
||||
$controller = new InternalController();
|
||||
$controller->setContainer($container);
|
||||
|
||||
$controller->indexAction('/', 'service:method');
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user