minor symfony#31448 [Form] Restore default locale during tests (ro0NL)

fabpot · fabpot · commit c717083d84ad · 2019-05-10T07:37:09.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Form] Restore default locale during tests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes-ish | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | symfony#31294 (comment) | License | MIT | Doc PR | symfony/symfony-docs#...  This fixes the failing tests in symfony#31294 Commits ------- 7fce86f [Form] Restore default locale during tests
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
@@ -17,13 +17,19 @@
 
 class IntegerToLocalizedStringTransformerTest extends TestCase
 {
+    private $defaultLocale;
+
     protected function setUp()
     {
-        parent::setUp();
-
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
     }
 
+    protected function tearDown()
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function transformWithRoundingProvider()
     {
         return [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -17,13 +17,19 @@
 
 class NumberToLocalizedStringTransformerTest extends TestCase
 {
+    private $defaultLocale;
+
     protected function setUp()
     {
-        parent::setUp();
-
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
     }
 
+    protected function tearDown()
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function provideTransformations()
     {
         return [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -17,13 +17,19 @@
 
 class PercentToLocalizedStringTransformerTest extends TestCase
 {
+    private $defaultLocale;
+
     protected function setUp()
     {
-        parent::setUp();
-
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
     }
 
+    protected function tearDown()
+    {
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function testTransform()
     {
         $transformer = new PercentToLocalizedStringTransformer();
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -20,17 +20,19 @@ class DateTypeTest extends BaseTypeTest
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType';
 
     private $defaultTimezone;
+    private $defaultLocale;
 
     protected function setUp()
     {
         parent::setUp();
         $this->defaultTimezone = date_default_timezone_get();
+        $this->defaultLocale = \Locale::getDefault();
     }
 
     protected function tearDown()
     {
         date_default_timezone_set($this->defaultTimezone);
-        \Locale::setDefault('en');
+        \Locale::setDefault($this->defaultLocale);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
@@ -17,13 +17,24 @@ class MoneyTypeTest extends BaseTypeTest
 {
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\MoneyType';
 
+    private $defaultLocale;
+
     protected function setUp()
     {
         // we test against different locales, so we need the full
         // implementation
         IntlTestHelper::requireFullIntl($this, false);
 
         parent::setUp();
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
     }
 
     public function testPassMoneyPatternToView()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -17,16 +17,26 @@ class NumberTypeTest extends BaseTypeTest
 {
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\NumberType';
 
+    private $defaultLocale;
+
     protected function setUp()
     {
         parent::setUp();
 
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('de_DE');
     }
 
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     public function testDefaultFormatting()
     {
         $form = $this->factory->create(static::TESTED_TYPE);

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,19 @@`
`17`	`17`
`18`	`18`	`class IntegerToLocalizedStringTransformerTest extends TestCase`
`19`	`19`	`{`
	`20`	`+ private $defaultLocale;`
	`21`	`+`
`20`	`22`	`protected function setUp()`
`21`	`23`	`{`
`22`		`- parent::setUp();`
`23`		`-`
	`24`	`+ $this->defaultLocale = \Locale::getDefault();`
`24`	`25`	`\Locale::setDefault('en');`
`25`	`26`	`}`
`26`	`27`
	`28`	`+ protected function tearDown()`
	`29`	`+ {`
	`30`	`+ \Locale::setDefault($this->defaultLocale);`
	`31`	`+ }`
	`32`	`+`
`27`	`33`	`public function transformWithRoundingProvider()`
`28`	`34`	`{`
`29`	`35`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,19 @@ class DateTypeTest extends BaseTypeTest`
`20`	`20`	`const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType';`
`21`	`21`
`22`	`22`	`private $defaultTimezone;`
	`23`	`+ private $defaultLocale;`
`23`	`24`
`24`	`25`	`protected function setUp()`
`25`	`26`	`{`
`26`	`27`	`parent::setUp();`
`27`	`28`	`$this->defaultTimezone = date_default_timezone_get();`
	`29`	`+ $this->defaultLocale = \Locale::getDefault();`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`protected function tearDown()`
`31`	`33`	`{`
`32`	`34`	`date_default_timezone_set($this->defaultTimezone);`
`33`		`- \Locale::setDefault('en');`
	`35`	`+ \Locale::setDefault($this->defaultLocale);`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,26 @@ class NumberTypeTest extends BaseTypeTest`
`17`	`17`	`{`
`18`	`18`	`const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\NumberType';`
`19`	`19`
	`20`	`+ private $defaultLocale;`
	`21`	`+`
`20`	`22`	`protected function setUp()`
`21`	`23`	`{`
`22`	`24`	`parent::setUp();`
`23`	`25`
`24`	`26`	`// we test against "de_DE", so we need the full implementation`
`25`	`27`	`IntlTestHelper::requireFullIntl($this, false);`
`26`	`28`
	`29`	`+ $this->defaultLocale = \Locale::getDefault();`
`27`	`30`	`\Locale::setDefault('de_DE');`
`28`	`31`	`}`
`29`	`32`
	`33`	`+ protected function tearDown()`
	`34`	`+ {`
	`35`	`+ parent::tearDown();`
	`36`	`+`
	`37`	`+ \Locale::setDefault($this->defaultLocale);`
	`38`	`+ }`
	`39`	`+`
`30`	`40`	`public function testDefaultFormatting()`
`31`	`41`	`{`
`32`	`42`	`$form = $this->factory->create(static::TESTED_TYPE);`