bug symfony#38127 [Translator] Make sure a null locale is handled properly (jschaedl)

fabpot · fabpot · commit 785a06653ca7 · 2020-09-18T10:46:54.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Translator] Make sure a null locale is handled properly | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix symfony#38124  | License | MIT | Doc PR | -   Commits ------- 080ea5a [Translator] Make sure a null locale is handled properly
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -19,6 +19,19 @@
 
 class TranslatorTest extends TestCase
 {
+    private $defaultLocale;
+
+    protected function setUp(): void
+    {
+        $this->defaultLocale = \Locale::getDefault();
+        \Locale::setDefault('en');
+    }
+
+    protected function tearDown(): void
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     /**
      * @dataProvider getInvalidLocalesTests
      */
@@ -45,7 +58,7 @@ public function testConstructorWithoutLocale()
     {
         $translator = new Translator(null);
 
-        $this->assertNull($translator->getLocale());
+        $this->assertSame('en', $translator->getLocale());
     }
 
     public function testSetGetLocale()
@@ -87,7 +100,7 @@ public function testSetNullLocale()
         $translator = new Translator('en');
         $translator->setLocale(null);
 
-        $this->assertNull($translator->getLocale());
+        $this->assertSame('en', $translator->getLocale());
     }
 
     public function testGetCatalogue()
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -171,7 +171,7 @@ public function setLocale($locale)
      */
     public function getLocale()
     {
-        return $this->locale;
+        return $this->locale ?? \Locale::getDefault();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public function setLocale($locale)`
`171`	`171`	`*/`
`172`	`172`	`public function getLocale()`
`173`	`173`	`{`
`174`		`- return $this->locale;`
	`174`	`+ return $this->locale ?? \Locale::getDefault();`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`/**`