Tweaks

thewilkybarkid · thewilkybarkid · commit 096a1e657c7b · 2018-12-13T08:44:28.000Z
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Routing\RequestContextAwareInterface;
 
@@ -42,7 +43,7 @@ public function __construct(RequestStack $requestStack, $defaultLocale = 'en', R
         $this->router = $router;
     }
 
-    public function onKernelRequestEarly(GetResponseEvent $event)
+    public function setDefaultLocale(KernelEvent $event)
     {
         $event->getRequest()->setDefaultLocale($this->defaultLocale);
     }
@@ -80,7 +81,7 @@ public static function getSubscribedEvents()
     {
         return array(
             KernelEvents::REQUEST => array(
-                array('onKernelRequestEarly', 100),
+                array('setDefaultLocale', 100),
                 // must be registered after the Router to have access to the _locale
                 array('onKernelRequest', 16),
             ),
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\LocaleListener;
@@ -29,29 +30,26 @@ protected function setUp()
 
     public function testIsAnEventSubscriber()
     {
-        $this->assertInstanceOf(
-            'Symfony\Component\EventDispatcher\EventSubscriberInterface',
-            new LocaleListener($this->requestStack)
-        );
+        $this->assertInstanceOf(EventSubscriberInterface::class, new LocaleListener($this->requestStack));
     }
 
     public function testRegisteredEvent()
     {
         $this->assertEquals(
             array(
-                KernelEvents::REQUEST => array(array('onKernelRequestEarly', 100), array('onKernelRequest', 16)),
+                KernelEvents::REQUEST => array(array('setDefaultLocale', 100), array('onKernelRequest', 16)),
                 KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
             ),
             LocaleListener::getSubscribedEvents()
         );
     }
 
-    public function testDefaultLocaleWithoutSession()
+    public function testDefaultLocale()
     {
         $listener = new LocaleListener($this->requestStack, 'fr');
         $event = $this->getEvent($request = Request::create('/'));
 
-        $listener->onKernelRequestEarly($event);
+        $listener->setDefaultLocale($event);
         $this->assertEquals('fr', $request->getLocale());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use Symfony\Component\HttpFoundation\RequestStack;`
`17`	`17`	`use Symfony\Component\HttpKernel\Event\FinishRequestEvent;`
`18`	`18`	`use Symfony\Component\HttpKernel\Event\GetResponseEvent;`
	`19`	`+use Symfony\Component\HttpKernel\Event\KernelEvent;`
`19`	`20`	`use Symfony\Component\HttpKernel\KernelEvents;`
`20`	`21`	`use Symfony\Component\Routing\RequestContextAwareInterface;`
`21`	`22`
`@@ -42,7 +43,7 @@ public function __construct(RequestStack $requestStack, $defaultLocale = 'en', R`
`42`	`43`	`$this->router = $router;`
`43`	`44`	`}`
`44`	`45`
`45`		`- public function onKernelRequestEarly(GetResponseEvent $event)`
	`46`	`+ public function setDefaultLocale(KernelEvent $event)`
`46`	`47`	`{`
`47`	`48`	`$event->getRequest()->setDefaultLocale($this->defaultLocale);`
`48`	`49`	`}`
`@@ -80,7 +81,7 @@ public static function getSubscribedEvents()`
`80`	`81`	`{`
`81`	`82`	`return array(`
`82`	`83`	`KernelEvents::REQUEST => array(`
`83`		`- array('onKernelRequestEarly', 100),`
	`84`	`+ array('setDefaultLocale', 100),`
`84`	`85`	`// must be registered after the Router to have access to the _locale`
`85`	`86`	`array('onKernelRequest', 16),`
`86`	`87`	`),`