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

check _controller attribute is a string before parsing it

This commit is contained in:
Alessandro Chitolina 2017-07-09 01:59:34 +02:00
parent c3ec5c5361
commit 0b349aee18
No known key found for this signature in database
GPG Key ID: 245FF08D9662DB42
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
View File

@ -33,7 +33,7 @@ class ResolveControllerNameSubscriber implements EventSubscriberInterface
public function onKernelRequest(GetResponseEvent $event)
{
$controller = $event->getRequest()->attributes->get('_controller');
if ($controller && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {
if (is_string($controller) && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {
// controller in the a:b:c notation then
$event->getRequest()->attributes->set('_controller', $this->parser->parse($controller));
}

15
src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
View File

@ -37,7 +37,10 @@ class ResolveControllerNameSubscriberTest extends TestCase
$this->assertEquals('App\\Final\\Format::methodName', $request->attributes->get('_controller'));
}
public function testSkipsOtherControllerFormats()
/**
* @dataProvider provideSkippedControllers
*/
public function testSkipsOtherControllerFormats($controller)
{
$parser = $this->getMockBuilder(ControllerNameParser::class)->disableOriginalConstructor()->getMock();
$parser->expects($this->never())
@ -45,10 +48,16 @@ class ResolveControllerNameSubscriberTest extends TestCase
$httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
$request = new Request();
$request->attributes->set('_controller', 'Other:format');
$request->attributes->set('_controller', $controller);
$subscriber = new ResolveControllerNameSubscriber($parser);
$subscriber->onKernelRequest(new GetResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
$this->assertEquals('Other:format', $request->attributes->get('_controller'));
$this->assertEquals($controller, $request->attributes->get('_controller'));
}
public function provideSkippedControllers()
{
yield array('Other:format');
yield array(function () {});
}
}