Dont set the locale implicitly, just use the value provided by \Local…

…e::getDefault() if none is set Add tests Signed-off-by: Matthias Kühne <[email protected]>
laminas · Dec 19, 2023 · c706c3f · c706c3f
1 parent cff848b
commit c706c3f
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 3 deletions.
diff --git a/src/View/Helper/CurrencyFormat.php b/src/View/Helper/CurrencyFormat.php
@@ -212,7 +212,7 @@ public function setLocale($locale)
     public function getLocale()
     {
         if ($this->locale === null) {
-            $this->locale = Locale::getDefault();
+            return Locale::getDefault();
         }
 
         return $this->locale;

diff --git a/src/View/Helper/DateFormat.php b/src/View/Helper/DateFormat.php
@@ -98,7 +98,7 @@ public function setLocale($locale)
     public function getLocale()
     {
         if ($this->locale === null) {
-            $this->locale = Locale::getDefault();
+            return Locale::getDefault();
         }
 
         return $this->locale;

diff --git a/src/View/Helper/NumberFormat.php b/src/View/Helper/NumberFormat.php
@@ -214,7 +214,7 @@ public function setLocale($locale)
     public function getLocale()
     {
         if ($this->locale === null) {
-            $this->locale = Locale::getDefault();
+            return Locale::getDefault();
         }
 
         return $this->locale;

diff --git a/test/View/Helper/CurrencyFormatTest.php b/test/View/Helper/CurrencyFormatTest.php
@@ -108,4 +108,16 @@ public static function assertMbStringEquals(string $expected, string $test, stri
         $test     = str_replace(["\xC2\xA0", ' '], '', $test);
         self::assertEquals($expected, $test, $message);
     }
+
+    public function testNoImplicitLocale(): void
+    {
+        Locale::setDefault('de');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        Locale::setDefault('en');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        $this->helper->setLocale('es');
+        self::assertEquals('es', $this->helper->getLocale());
+    }
 }
diff --git a/test/View/Helper/DateFormatTest.php b/test/View/Helper/DateFormatTest.php
@@ -292,4 +292,16 @@ public function testIntlCalendarIsHandledAsWell(): void
             $helper->__invoke($calendar, IntlDateFormatter::FULL, IntlDateFormatter::FULL, 'it_IT', 'dd-MM-Y')
         );
     }
+
+    public function testNoImplicitLocale(): void
+    {
+        Locale::setDefault('de');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        Locale::setDefault('en');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        $this->helper->setLocale('es');
+        self::assertEquals('es', $this->helper->getLocale());
+    }
 }
diff --git a/test/View/Helper/NumberFormatTest.php b/test/View/Helper/NumberFormatTest.php
@@ -196,4 +196,16 @@ public static function assertMbStringEquals(string $expected, string $test, stri
         $test     = str_replace(["\xC2\xA0", ' '], '', $test);
         self::assertEquals($expected, $test, $message);
     }
+
+    public function testNoImplicitLocale(): void
+    {
+        Locale::setDefault('de');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        Locale::setDefault('en');
+        self::assertEquals(Locale::getDefault(), $this->helper->getLocale());
+
+        $this->helper->setLocale('es');
+        self::assertEquals('es', $this->helper->getLocale());
+    }
 }