Set the default locale early

thewilkybarkid · thewilkybarkid · commit c499c470c66f · 2018-12-06T09:26:04.000Z
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -42,10 +42,14 @@ public function __construct(RequestStack $requestStack, $defaultLocale = 'en', R
         $this->router = $router;
     }
 
+    public function onKernelRequestEarly(GetResponseEvent $event)
+    {
+        $event->getRequest()->setDefaultLocale($this->defaultLocale);
+    }
+
     public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
-        $request->setDefaultLocale($this->defaultLocale);
 
         $this->setLocale($request);
         $this->setRouterContext($request);
@@ -75,6 +79,7 @@ private function setRouterContext(Request $request)
     public static function getSubscribedEvents()
     {
         return array(
+            KernelEvents::REQUEST => array(array('onKernelRequestEarly', 100)),
             // must be registered after the Router to have access to the _locale
             KernelEvents::REQUEST => array(array('onKernelRequest', 16)),
             KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -31,7 +31,7 @@ public function testDefaultLocaleWithoutSession()
         $listener = new LocaleListener($this->requestStack, 'fr');
         $event = $this->getEvent($request = Request::create('/'));
 
-        $listener->onKernelRequest($event);
+        $listener->onKernelRequestEarly($event);
         $this->assertEquals('fr', $request->getLocale());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testDefaultLocaleWithoutSession()`
`31`	`31`	`$listener = new LocaleListener($this->requestStack, 'fr');`
`32`	`32`	`$event = $this->getEvent($request = Request::create('/'));`
`33`	`33`
`34`		`- $listener->onKernelRequest($event);`
	`34`	`+ $listener->onKernelRequestEarly($event);`
`35`	`35`	`$this->assertEquals('fr', $request->getLocale());`
`36`	`36`	`}`
`37`	`37`