Merge branch '4.4' into 5.2

derrabus · derrabus · commit ef17a590962e · 2021-04-24T16:39:13.000+02:00
* 4.4:
  [CI] Make sure to restore default locale
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -26,13 +26,15 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
 
     protected $csrfTokenManager;
     protected $testableFeatures = [];
+    private $defaultLocale;
 
     protected function setUp(): void
     {
         if (!\extension_loaded('intl')) {
             $this->markTestSkipped('Extension intl is required.');
         }
 
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
 
         $this->csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
@@ -50,6 +52,7 @@ protected function getExtensions()
     protected function tearDown(): void
     {
         $this->csrfTokenManager = null;
+        \Locale::setDefault($this->defaultLocale);
 
         parent::tearDown();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -23,6 +23,7 @@ class DateTimeToLocalizedStringTransformerTest extends TestCase
 
     protected $dateTime;
     protected $dateTimeWithoutSeconds;
+    private $defaultLocale;
 
     protected function setUp(): void
     {
@@ -37,6 +38,7 @@ protected function setUp(): void
         // Since we test against "de_AT", we need the full implementation
         IntlTestHelper::requireFullIntl($this, '57.1');
 
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('de_AT');
 
         $this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC');
@@ -47,6 +49,7 @@ protected function tearDown(): void
     {
         $this->dateTime = null;
         $this->dateTimeWithoutSeconds = null;
+        \Locale::setDefault($this->defaultLocale);
     }
 
     public function dataProvider()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -19,15 +19,18 @@
 class MoneyToLocalizedStringTransformerTest extends TestCase
 {
     private $previousLocale;
+    private $defaultLocale;
 
     protected function setUp(): void
     {
         $this->previousLocale = setlocale(\LC_ALL, '0');
+        $this->defaultLocale = \Locale::getDefault();
     }
 
     protected function tearDown(): void
     {
         setlocale(\LC_ALL, $this->previousLocale);
+        \Locale::setDefault($this->defaultLocale);
     }
 
     public function testTransform()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -18,13 +18,20 @@ class DateTimeTypeTest extends BaseTypeTest
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType';
 
+    private $defaultLocale;
+
     protected function setUp(): void
     {
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
-
         parent::setUp();
     }
 
+    protected function tearDown(): void
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function testSubmitDateTime()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
@@ -725,13 +725,20 @@ abstract class ResourceBundleTestCase extends TestCase
     ];
 
     private static $rootLocales;
+    private $defaultLocale;
 
     protected function setUp(): void
     {
+        $this->defaultLocale = \Locale::getDefault();
         Locale::setDefault('en');
         Locale::setDefaultFallback('en');
     }
 
+    protected function tearDown(): void
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function provideLocales()
     {
         return array_map(
diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
@@ -30,6 +30,18 @@
  */
 class TranslatorTest extends TestCase
 {
+    private $defaultLocale;
+
+    protected function setUp(): void
+    {
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown(): void
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function getTranslator()
     {
         return new class() implements TranslatorInterface {

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,15 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase`
`26`	`26`
`27`	`27`	`protected $csrfTokenManager;`
`28`	`28`	`protected $testableFeatures = [];`
	`29`	`+ private $defaultLocale;`
`29`	`30`
`30`	`31`	`protected function setUp(): void`
`31`	`32`	`{`
`32`	`33`	`if (!\extension_loaded('intl')) {`
`33`	`34`	`$this->markTestSkipped('Extension intl is required.');`
`34`	`35`	`}`
`35`	`36`
	`37`	`+ $this->defaultLocale = \Locale::getDefault();`
`36`	`38`	`\Locale::setDefault('en');`
`37`	`39`
`38`	`40`	`$this->csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);`
`@@ -50,6 +52,7 @@ protected function getExtensions()`
`50`	`52`	`protected function tearDown(): void`
`51`	`53`	`{`
`52`	`54`	`$this->csrfTokenManager = null;`
	`55`	`+ \Locale::setDefault($this->defaultLocale);`
`53`	`56`
`54`	`57`	`parent::tearDown();`
`55`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class DateTimeToLocalizedStringTransformerTest extends TestCase`
`23`	`23`
`24`	`24`	`protected $dateTime;`
`25`	`25`	`protected $dateTimeWithoutSeconds;`
	`26`	`+ private $defaultLocale;`
`26`	`27`
`27`	`28`	`protected function setUp(): void`
`28`	`29`	`{`
`@@ -37,6 +38,7 @@ protected function setUp(): void`
`37`	`38`	`// Since we test against "de_AT", we need the full implementation`
`38`	`39`	`IntlTestHelper::requireFullIntl($this, '57.1');`
`39`	`40`
	`41`	`+ $this->defaultLocale = \Locale::getDefault();`
`40`	`42`	`\Locale::setDefault('de_AT');`
`41`	`43`
`42`	`44`	`$this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC');`
`@@ -47,6 +49,7 @@ protected function tearDown(): void`
`47`	`49`	`{`
`48`	`50`	`$this->dateTime = null;`
`49`	`51`	`$this->dateTimeWithoutSeconds = null;`
	`52`	`+ \Locale::setDefault($this->defaultLocale);`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`public function dataProvider()`
Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,18 @@`
`19`	`19`	`class MoneyToLocalizedStringTransformerTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`private $previousLocale;`
	`22`	`+ private $defaultLocale;`
`22`	`23`
`23`	`24`	`protected function setUp(): void`
`24`	`25`	`{`
`25`	`26`	`$this->previousLocale = setlocale(\LC_ALL, '0');`
	`27`	`+ $this->defaultLocale = \Locale::getDefault();`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`protected function tearDown(): void`
`29`	`31`	`{`
`30`	`32`	`setlocale(\LC_ALL, $this->previousLocale);`
	`33`	`+ \Locale::setDefault($this->defaultLocale);`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public function testTransform()`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,20 @@ class DateTimeTypeTest extends BaseTypeTest`
`18`	`18`	`{`
`19`	`19`	`public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType';`
`20`	`20`
	`21`	`+ private $defaultLocale;`
	`22`	`+`
`21`	`23`	`protected function setUp(): void`
`22`	`24`	`{`
	`25`	`+ $this->defaultLocale = \Locale::getDefault();`
`23`	`26`	`\Locale::setDefault('en');`
`24`		`-`
`25`	`27`	`parent::setUp();`
`26`	`28`	`}`
`27`	`29`
	`30`	`+ protected function tearDown(): void`
	`31`	`+ {`
	`32`	`+ \Locale::setDefault($this->defaultLocale);`
	`33`	`+ }`
	`34`	`+`
`28`	`35`	`public function testSubmitDateTime()`
`29`	`36`	`{`
`30`	`37`	`$form = $this->factory->create(static::TESTED_TYPE, null, [`
Original file line number	Diff line number	Diff line change
`@@ -725,13 +725,20 @@ abstract class ResourceBundleTestCase extends TestCase`
`725`	`725`	`];`
`726`	`726`
`727`	`727`	`private static $rootLocales;`
	`728`	`+ private $defaultLocale;`
`728`	`729`
`729`	`730`	`protected function setUp(): void`
`730`	`731`	`{`
	`732`	`+ $this->defaultLocale = \Locale::getDefault();`
`731`	`733`	`Locale::setDefault('en');`
`732`	`734`	`Locale::setDefaultFallback('en');`
`733`	`735`	`}`
`734`	`736`
	`737`	`+ protected function tearDown(): void`
	`738`	`+ {`
	`739`	`+ \Locale::setDefault($this->defaultLocale);`
	`740`	`+ }`
	`741`	`+`
`735`	`742`	`public function provideLocales()`
`736`	`743`	`{`
`737`	`744`	`return array_map(`