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

merged the two Router listener hooks (this hack was needed when the Firewall was registered between those two hooks; this is not needed anymore)

Browse Source
This commit is contained in:
Fabien Potencier 2011-11-17 13:19:14 +01:00
parent e3655f3a5c
commit e886d733fb
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
View File

@ -38,21 +38,14 @@ class RouterListener implements EventSubscriberInterface
$this->logger = $logger;
}
public function onEarlyKernelRequest(GetResponseEvent $event)
{
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
return;
}
// set the context even if the parsing does not need to be done
// to have correct link generation
$this->urlMatcher->getContext()->fromRequest($event->getRequest());
}
public function onKernelRequest(GetResponseEvent $event)
{
$request = $event->getRequest();
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
$this->urlMatcher->getContext()->fromRequest($request);
}
if ($request->attributes->has('_controller')) {
// routing is already done
return;
@ -93,11 +86,7 @@ class RouterListener implements EventSubscriberInterface
static public function getSubscribedEvents()
{
return array(
KernelEvents::REQUEST => array(
// the early method must be called before the Firewall to be able to generate URLs correctly
array('onEarlyKernelRequest', 128),
array('onKernelRequest', 32),
),
KernelEvents::REQUEST => array(array('onKernelRequest', 32)),
);
}
}

2
tests/Symfony/Tests/Component/HttpKernel/EventListener/RouterListenerTest.php
View File

@ -36,7 +36,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
$listener = new RouterListener($urlMatcher);
$event = $this->createGetResponseEventForUri($uri);
$listener->onEarlyKernelRequest($event);
$listener->onKernelRequest($event);
$this->assertEquals($expectedHttpPort, $context->getHttpPort());
$this->assertEquals($expectedHttpsPort, $context->getHttpsPort());