symfony
diff --git a/‎src/Symfony/Component/Translation/Tests/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/TranslatorTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Translation/Tests/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/TranslatorTest.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+5-4Lines changed: 5 additions & 4 deletions
@@ -50,7 +50,7 @@ public function testConstructorValidLocale($locale)
     {
         $translator = new Translator($locale);
 
-        $this->assertSame($locale, $translator->getLocale());
+        $this->assertSame($locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en'), $translator->getLocale());
     }
 
     /**
@@ -91,7 +91,7 @@ public function testSetValidLocale($locale)
         $translator = new Translator($locale);
         $translator->setLocale($locale);
 
-        $this->assertEquals($locale, $translator->getLocale());
+        $this->assertEquals($locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en'), $translator->getLocale());
     }
 
     /**
 
@@ -143,6 +143,7 @@ public function addResource($format, $resource, $locale, $domain = null)
         }
 
         $this->assertValidLocale($locale);
+        $locale ?: $locale = class_exists(\Locale::class) ? \Locale::getDefault() : 'en';
 
         $this->resources[$locale][] = [$format, $resource, $domain];
 
@@ -163,15 +164,15 @@ public function setLocale($locale)
         }
 
         $this->assertValidLocale($locale);
-        $this->locale = $locale ?? (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
+        $this->locale = $locale;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getLocale()
     {
-        return $this->locale;
+        return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
     }
 
     /**
@@ -281,7 +282,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
      */
     public function getCatalogue($locale = null)
     {
-        if (null === $locale) {
+        if (!$locale) {
             $locale = $this->getLocale();
         } else {
             $this->assertValidLocale($locale);
@@ -505,7 +506,7 @@ protected function computeFallbackLocales($locale)
      */
     protected function assertValidLocale($locale)
     {
-        if (null !== $locale && 1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
+        if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', (string) $locale)) {
             throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testConstructorValidLocale($locale)`
`50`	`50`	`{`
`51`	`51`	`$translator = new Translator($locale);`
`52`	`52`
`53`		`- $this->assertSame($locale, $translator->getLocale());`
	`53`	`+ $this->assertSame($locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en'), $translator->getLocale());`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
`@@ -91,7 +91,7 @@ public function testSetValidLocale($locale)`
`91`	`91`	`$translator = new Translator($locale);`
`92`	`92`	`$translator->setLocale($locale);`
`93`	`93`
`94`		`- $this->assertEquals($locale, $translator->getLocale());`
	`94`	`+ $this->assertEquals($locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en'), $translator->getLocale());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public function addResource($format, $resource, $locale, $domain = null)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`$this->assertValidLocale($locale);`
	`146`	`+ $locale ?: $locale = class_exists(\Locale::class) ? \Locale::getDefault() : 'en';`
`146`	`147`
`147`	`148`	`$this->resources[$locale][] = [$format, $resource, $domain];`
`148`	`149`
`@@ -163,15 +164,15 @@ public function setLocale($locale)`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`$this->assertValidLocale($locale);`
`166`		`- $this->locale = $locale ?? (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');`
	`167`	`+ $this->locale = $locale;`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`/**`
`170`	`171`	`* {@inheritdoc}`
`171`	`172`	`*/`
`172`	`173`	`public function getLocale()`
`173`	`174`	`{`
`174`		`- return $this->locale;`
	`175`	`+ return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`/**`
`@@ -281,7 +282,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = null`
`281`	`282`	`*/`
`282`	`283`	`public function getCatalogue($locale = null)`
`283`	`284`	`{`
`284`		`- if (null === $locale) {`
	`285`	`+ if (!$locale) {`
`285`	`286`	`$locale = $this->getLocale();`
`286`	`287`	`} else {`
`287`	`288`	`$this->assertValidLocale($locale);`
`@@ -505,7 +506,7 @@ protected function computeFallbackLocales($locale)`
`505`	`506`	`*/`
`506`	`507`	`protected function assertValidLocale($locale)`
`507`	`508`	`{`
`508`		`- if (null !== $locale && 1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {`
	`509`	`+ if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', (string) $locale)) {`
`509`	`510`	`throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));`
`510`	`511`	`}`
`511`	`512`	`}`