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

merged branch uwej711/fix_locale_is_overridden_2_1 (PR #7686) 

This PR was merged into the 2.1 branch.

Discussion
----------

[HttpKernel] fix overwriting of request's locale if attribute _locale is missing

In addition to https://github.com/symfony/symfony/pull/7516 same change for the 2.1 branch, see comments on https://github.com/lunetics/LocaleBundle/pull/59

Commits
-------

da156d3 fix overwriting of request's locale if attribute _locale is missing
This commit is contained in:
Fabien Potencier 2013-04-17 07:38:53 +02:00
parent 41fef9310a da156d3f94
commit 580b249310
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
View File

@ -50,7 +50,7 @@ class LocaleListener implements EventSubscriberInterface
$request = $event->getRequest();
$request->setDefaultLocale($this->defaultLocale);
$this->setLocale($request, $request->attributes->get('_locale', $this->defaultLocale));
$this->setLocale($request, $request->attributes->get('_locale', $request->getLocale()));
array_unshift($this->locales, $request->getLocale());
}

11
src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
View File

@ -68,6 +68,17 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
$listener->onKernelRequest($this->getEvent($request));
}
public function testRequestLocaleIsNotOverridden()
{
$request = Request::create('/');
$request->setLocale('de');
$listener = new LocaleListener('fr');
$event = $this->getEvent($request);
$listener->onKernelRequest($event);
$this->assertEquals('de', $request->getLocale());
}
private function getEvent(Request $request)
{
return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);