Make Translator::getLocale() behave the same like TranslatorTrait::getLocale()

jschaedl · jschaedl · commit 6de7ed8b5074 · 2020-09-18T10:51:38.000+02:00
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -510,7 +510,6 @@ public function getInvalidLocalesTests()
     public function getValidLocalesTests()
     {
         return [
-            [''],
             ['fr'],
             ['francais'],
             ['FR'],
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -91,6 +91,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
      */
     public function __construct(string $locale, MessageFormatterInterface $formatter = null, string $cacheDir = null, bool $debug = false, array $cacheVary = [])
     {
+        if ('' === $locale) {
+            trigger_deprecation('symfony/translator', '5.2', sprintf('Passing "" as the $locale argument to %s::%s() is deprecated, it will throw an InvalidArgumentException in version 6.0.', get_class($this), __METHOD__));
+        }
+
         $this->setLocale($locale);
 
         if (null === $formatter) {
@@ -158,7 +162,7 @@ public function setLocale(string $locale)
      */
     public function getLocale()
     {
-        return $this->locale;
+        return $this->locale ?: \Locale::getDefault();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,6 @@ public function getInvalidLocalesTests()`
`510`	`510`	`public function getValidLocalesTests()`
`511`	`511`	`{`
`512`	`512`	`return [`
`513`		`- [''],`
`514`	`513`	`['fr'],`
`515`	`514`	`['francais'],`
`516`	`515`	`['FR'],`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA`
`91`	`91`	`*/`
`92`	`92`	`public function __construct(string $locale, MessageFormatterInterface $formatter = null, string $cacheDir = null, bool $debug = false, array $cacheVary = [])`
`93`	`93`	`{`
	`94`	`+ if ('' === $locale) {`
	`95`	`+ trigger_deprecation('symfony/translator', '5.2', sprintf('Passing "" as the $locale argument to %s::%s() is deprecated, it will throw an InvalidArgumentException in version 6.0.', get_class($this), __METHOD__));`
	`96`	`+ }`
	`97`	`+`
`94`	`98`	`$this->setLocale($locale);`
`95`	`99`
`96`	`100`	`if (null === $formatter) {`
`@@ -158,7 +162,7 @@ public function setLocale(string $locale)`
`158`	`162`	`*/`
`159`	`163`	`public function getLocale()`
`160`	`164`	`{`
`161`		`- return $this->locale;`
	`165`	`+ return $this->locale ?: \Locale::getDefault();`
`162`	`166`	`}`
`163`	`167`
`164`	`168`	`/**`