Merge branch '4.4'

* 4.4:
  fix merge
  Fix inconsistent return points.
  pass translation parameters to the trans filter
  [Mime] fixed wrong mimetype
  [ProxyManagerBridge] Polyfill for unmaintained version
  [HttpClient] Declare `$active` first to prevent weird issue
  Remove deprecated assertContains
  [HttpClient] fix tests
  SCA: dropped unused mocks, duplicate import and a function alias usage
  Added correct plural for box -> boxes
  [Config] fix test
  Fix remaining tests
  fix getName() when transport is null
  [Console] Check for ErrorHandler classes
  Improve fa (persian) translation

Author: nicolas-grekas

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'],