merged the two Locale listener hooks (this hack was needed when the Firewall was registered before the Routing; this is not needed anymore)

fabpot · fabpot · commit c98c2ef5fbf3 · 2011-11-17T14:22:57.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -27,37 +27,22 @@ class LocaleListener implements EventSubscriberInterface
     private $router;
     private $defaultLocale;
 
-    public function __construct($defaultLocale = 'en', RouterInterface $router
-        = null)
+    public function __construct($defaultLocale = 'en', RouterInterface $router = null)
     {
         $this->defaultLocale = $defaultLocale;
         $this->router = $router;
     }
 
-    public function onEarlyKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
+
         if ($request->hasPreviousSession()) {
-            $request->setDefaultLocale($request->getSession()->get('_locale',
-                $this->defaultLocale));
+            $request->setDefaultLocale($request->getSession()->get('_locale', $this->defaultLocale));
         } else {
             $request->setDefaultLocale($this->defaultLocale);
         }
 
-        if (null !== $this->router && ($context = $this->router->getContext())
-                && !$context->hasParameter('_locale')) {
-            $this->router->getContext()->setParameter('_locale',
-                $request->getLocale());
-        }
-    }
-
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
-            return;
-        }
-
-        $request = $event->getRequest();
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
 
@@ -67,21 +52,15 @@ public function onKernelRequest(GetResponseEvent $event)
         }
 
         if (null !== $this->router) {
-            $this->router->getContext()->setParameter('_locale',
-                $request->getLocale());
+            $this->router->getContext()->setParameter('_locale', $request->getLocale());
         }
     }
 
     static public function getSubscribedEvents()
     {
         return array(
-            KernelEvents::REQUEST => array(
-                // must be registered after the session listener
-                array('onEarlyKernelRequest', 255),
-
-                // must be registered after the Router to have access to the _locale
-                array('onKernelRequest', 16),
-            ),
+            // must be registered after the Router to have access to the _locale
+            KernelEvents::REQUEST => array(array('onKernelRequest', 16)),
         );
     }
 }
diff --git a/tests/Symfony/Tests/Component/HttpKernel/EventListener/LocaleListenerTest.php b/tests/Symfony/Tests/Component/HttpKernel/EventListener/LocaleListenerTest.php
@@ -23,7 +23,7 @@ public function testDefaultLocaleWithoutSession()
         $listener = new LocaleListener('fr');
         $event = $this->getEvent($request = Request::create('/'));
 
-        $listener->onEarlyKernelRequest($event);
+        $listener->onKernelRequest($event);
         $this->assertEquals('fr', $request->getLocale());
     }
 
@@ -40,7 +40,7 @@ public function testDefaultLocaleWithSession()
         $listener = new LocaleListener('fr');
         $event = $this->getEvent($request);
 
-        $listener->onEarlyKernelRequest($event);
+        $listener->onKernelRequest($event);
         $this->assertEquals('es', $request->getLocale());
     }
 
@@ -55,8 +55,9 @@ public function testLocaleFromRequestAttribute()
         $event = $this->getEvent($request);
 
         // also updates the session _locale value
-        $session = $this->getMock('Symfony\Component\HttpFoundation\Session', array('set'), array(), '', false);
+        $session = $this->getMock('Symfony\Component\HttpFoundation\Session', array('set', 'get'), array(), '', false);
         $session->expects($this->once())->method('set')->with('_locale', 'es');
+        $session->expects($this->once())->method('get')->with('_locale')->will($this->returnValue('es'));
         $request->setSession($session);
 
         $listener->onKernelRequest($event);
