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

[FrameworkBundle] fixed WDT for redirects emitted by the Security component

Browse Source
This commit is contained in:
Fabien Potencier 2011-06-04 10:25:44 +02:00
parent 611a4a212c
commit c62b2309cf
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
View File

@ -42,29 +42,35 @@ class RouterListener
$this->logger = $logger;
}
public function onEarlyCoreRequest(GetResponseEvent $event)
{
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
return;
}
$request = $event->getRequest();
// set the context even if the parsing does not need to be done
// to have correct link generation
$context = new RequestContext(
$request->getBaseUrl(),
$request->getMethod(),
$request->getHost(),
$request->getScheme(),
$request->isSecure() ? $this->httpPort : $request->getPort(),
$request->isSecure() ? $request->getPort() : $this->httpsPort
);
if ($session = $request->getSession()) {
$context->setParameter('_locale', $session->getLocale());
}
$this->router->setContext($context);
}
public function onCoreRequest(GetResponseEvent $event)
{
$request = $event->getRequest();
$master = HttpKernelInterface::MASTER_REQUEST === $event->getRequestType();
if ($master) {
// set the context even if the parsing does not need to be done
// to have correct link generation
$context = new RequestContext(
$request->getBaseUrl(),
$request->getMethod(),
$request->getHost(),
$request->getScheme(),
$request->isSecure() ? $this->httpPort : $request->getPort(),
$request->isSecure() ? $request->getPort() : $this->httpsPort
);
if ($session = $request->getSession()) {
$context->setParameter('_locale', $session->getLocale());
}
$this->router->setContext($context);
}
if ($request->attributes->has('_controller')) {
// routing is already done
@ -94,7 +100,7 @@ class RouterListener
throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e);
}
if ($master && $locale = $request->attributes->get('_locale')) {
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType() && $locale = $request->attributes->get('_locale')) {
$request->getSession()->setLocale($locale);
$context->setParameter('_locale', $locale);
}

1
src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
View File

@ -28,6 +28,7 @@
</service>
<service id="router_listener" class="%router_listener.class%">
<tag name="kernel.listener" event="core.request" method="onEarlyCoreRequest" priority="255" />
<tag name="kernel.listener" event="core.request" method="onCoreRequest" />
<tag name="monolog.logger" channel="request" />
<argument type="service" id="router" />