Merge branch '4.4' into 5.2

derrabus · derrabus · commit 6d40be5e4331 · 2021-04-24T16:39:13.000+02:00
* 4.4:
  [CI] Make sure to restore default locale
diff --git a/Tests/ResourceBundleTestCase.php b/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(

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(`