minor #33280 fix deprecated call to setLocale with null (Tobion)

nicolas-grekas · nicolas-grekas · commit 8d8d3d4d403f · 2019-08-21T17:06:06.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- fix deprecated call to setLocale with null | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets |  | License | MIT | Doc PR | Fix a potentially invalid call since #33272 Commits ------- 26f9afe fix deprecated call to setLocale with null
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php
@@ -46,7 +46,9 @@ public function onKernelRequest(RequestEvent $event): void
     public function onKernelFinishRequest(FinishRequestEvent $event): void
     {
         if (null === $parentRequest = $this->requestStack->getParentRequest()) {
-            $this->setLocale($event->getRequest()->getDefaultLocale());
+            foreach ($this->localeAwareServices as $service) {
+                $service->setLocale($event->getRequest()->getDefaultLocale());
+            }
 
             return;
         }
@@ -63,7 +65,7 @@ public static function getSubscribedEvents()
         ];
     }
 
-    private function setLocale(string $locale, string $defaultLocale = null): void
+    private function setLocale(string $locale, string $defaultLocale): void
     {
         foreach ($this->localeAwareServices as $service) {
             try {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ public function onKernelRequest(RequestEvent $event): void`
`46`	`46`	`public function onKernelFinishRequest(FinishRequestEvent $event): void`
`47`	`47`	`{`
`48`	`48`	`if (null === $parentRequest = $this->requestStack->getParentRequest()) {`
`49`		`- $this->setLocale($event->getRequest()->getDefaultLocale());`
	`49`	`+ foreach ($this->localeAwareServices as $service) {`
	`50`	`+ $service->setLocale($event->getRequest()->getDefaultLocale());`
	`51`	`+ }`
`50`	`52`
`51`	`53`	`return;`
`52`	`54`	`}`
`@@ -63,7 +65,7 @@ public static function getSubscribedEvents()`
`63`	`65`	`];`
`64`	`66`	`}`
`65`	`67`
`66`		`- private function setLocale(string $locale, string $defaultLocale = null): void`
	`68`	`+ private function setLocale(string $locale, string $defaultLocale): void`
`67`	`69`	`{`
`68`	`70`	`foreach ($this->localeAwareServices as $service) {`
`69`	`71`	`try {`