Merge branch '5.2' into 5.x

derrabus · derrabus · commit 2ede829eb9eb · 2021-04-24T16:39:57.000+02:00
* 5.2:
  [DependencyInjection] Add missing bool type in procesValue()
  [CI] Make sure to restore default locale
diff --git a/Tests/ResourceBundleTestCase.php b/Tests/ResourceBundleTestCase.php
@@ -724,13 +724,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
`@@ -724,13 +724,20 @@ abstract class ResourceBundleTestCase extends TestCase`
`724`	`724`	`];`
`725`	`725`
`726`	`726`	`private static $rootLocales;`
	`727`	`+ private $defaultLocale;`
`727`	`728`
`728`	`729`	`protected function setUp(): void`
`729`	`730`	`{`
	`731`	`+ $this->defaultLocale = \Locale::getDefault();`
`730`	`732`	`Locale::setDefault('en');`
`731`	`733`	`Locale::setDefaultFallback('en');`
`732`	`734`	`}`
`733`	`735`
	`736`	`+ protected function tearDown(): void`
	`737`	`+ {`
	`738`	`+ \Locale::setDefault($this->defaultLocale);`
	`739`	`+ }`
	`740`	`+`
`734`	`741`	`public function provideLocales()`
`735`	`742`	`{`
`736`	`743`	`return array_map(`