bug #38283 [Translator] Optional Intl dependency (ro0NL)

fabpot · fabpot · commit d9bcb64fc003 · 2020-09-24T11:40:07.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Translator] Optional Intl dependency | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38279 | License | MIT | Doc PR | symfony/symfony-docs#...   i decided to cast $locale at construct, given its property is documented to be string Commits ------- a2eb263 [Translator] Optional Intl dependency
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -163,15 +163,15 @@ public function setLocale($locale)
         }
 
         $this->assertValidLocale($locale);
-        $this->locale = $locale;
+        $this->locale = $locale ?? (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
     }
 
     /**
      * {@inheritdoc}
      */
     public function getLocale()
     {
-        return $this->locale ?? \Locale::getDefault();
+        return $this->locale;
     }
 
     /**
