Merge branch '3.4' into 4.3

* 3.4:
  Fix inconsistent return points.
  Fix remaining tests

Author: nicolas-grekas

Tests/Data/Provider/AbstractCurrencyDataProviderTest.php

@@ -591,6 +591,7 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
      * @var CurrencyDataProvider
      */
     protected $dataProvider;
+    private $defaultLocale;
 
     protected function setUp()
     {
@@ -600,6 +601,15 @@ protected function setUp()
             $this->getDataDirectory().'/'.Intl::CURRENCY_DIR,
             $this->createEntryReader()
         );
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
     }
 
     abstract protected function getDataDirectory();

Tests/Data/Provider/AbstractLanguageDataProviderTest.php

@@ -830,6 +830,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
      * @var LanguageDataProvider
      */
     protected $dataProvider;
+    private $defaultLocale;
 
     protected function setUp()
     {
@@ -839,6 +840,15 @@ protected function setUp()
             $this->getDataDirectory().'/'.Intl::LANGUAGE_DIR,
             $this->createEntryReader()
         );
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
     }
 
     abstract protected function getDataDirectory();

Tests/Data/Provider/AbstractLocaleDataProviderTest.php

@@ -25,6 +25,7 @@ abstract class AbstractLocaleDataProviderTest extends AbstractDataProviderTest
      * @var LocaleDataProvider
      */
     protected $dataProvider;
+    private $defaultLocale;
 
     protected function setUp()
     {
@@ -34,6 +35,13 @@ protected function setUp()
             $this->getDataDirectory().'/'.Intl::LOCALE_DIR,
             $this->createEntryReader()
         );
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        \Locale::setDefault($this->defaultLocale);
     }
 
     abstract protected function getDataDirectory();

Tests/Data/Provider/AbstractRegionDataProviderTest.php

@@ -279,6 +279,7 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest
      * @var RegionDataProvider
      */
     protected $dataProvider;
+    private $defaultLocale;
 
     protected function setUp()
     {
@@ -288,6 +289,15 @@ protected function setUp()
             $this->getDataDirectory().'/'.Intl::REGION_DIR,
             $this->createEntryReader()
         );
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
     }
 
     abstract protected function getDataDirectory();

Tests/Data/Provider/AbstractScriptDataProviderTest.php

@@ -219,6 +219,7 @@ abstract class AbstractScriptDataProviderTest extends AbstractDataProviderTest
      * @var ScriptDataProvider
      */
     protected $dataProvider;
+    private $defaultLocale;
 
     protected function setUp()
     {
@@ -228,6 +229,15 @@ protected function setUp()
             $this->getDataDirectory().'/'.Intl::SCRIPT_DIR,
             $this->createEntryReader()
         );
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
     }
 
     abstract protected function getDataDirectory();

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

@@ -24,11 +24,23 @@
  */
 abstract class AbstractIntlDateFormatterTest extends TestCase
 {
+    private $defaultLocale;
+
     protected function setUp()
     {
+        parent::setUp();
+
+        $this->defaultLocale = \Locale::getDefault();
         \Locale::setDefault('en');
     }
 
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     /**
      * When a time zone is not specified, it uses the system default however it returns null in the getter method.
      *

Tests/IntlTest.php

@@ -16,6 +16,22 @@
 
 class IntlTest extends TestCase
 {
+    private $defaultLocale;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->defaultLocale = \Locale::getDefault();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        \Locale::setDefault($this->defaultLocale);
+    }
+
     /**
      * @requires extension intl
      */

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -36,7 +36,7 @@ public function formatCurrencyWithDecimalStyleProvider()
     {
         return [
             [100, 'ALL', '100'],
-            [100, 'BRL', '100.00'],
+            [100, 'BRL', '100'],
             [100, 'CRC', '100'],
             [100, 'JPY', '100'],
             [100, 'CHF', '100'],