diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translator] Make sure a null locale is handled properly

Browse Source
This commit is contained in:
Jan Schädlich 2020-09-09 13:50:45 +02:00 committed by Fabien Potencier
parent cae08a0279
commit 080ea5a0f7
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Symfony/Component/Translation/Tests/TranslatorTest.php
View File

@ -19,6 +19,19 @@ use Symfony\Component\Translation\Translator;
class TranslatorTest extends TestCase 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 * @dataProvider getInvalidLocalesTests
*/ */
@ -45,7 +58,7 @@ class TranslatorTest extends TestCase
{ {
$translator = new Translator(null); $translator = new Translator(null);
$this->assertNull($translator->getLocale()); $this->assertSame('en', $translator->getLocale());
} }
public function testSetGetLocale() public function testSetGetLocale()
@ -87,7 +100,7 @@ class TranslatorTest extends TestCase
$translator = new Translator('en'); $translator = new Translator('en');
$translator->setLocale(null); $translator->setLocale(null);
$this->assertNull($translator->getLocale()); $this->assertSame('en', $translator->getLocale());
} }
public function testGetCatalogue() public function testGetCatalogue()

2
src/Symfony/Component/Translation/Translator.php
View File

@ -171,7 +171,7 @@ class Translator implements LegacyTranslatorInterface, TranslatorInterface, Tran
*/ */
public function getLocale() public function getLocale()
{ {
return $this->locale; return $this->locale ?? \Locale::getDefault();
} }
/** /**