Merge branch '4.4' into 5.1

* 4.4:
  use expectWarning() when possible

Author: fabpot

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -324,7 +324,11 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        $this->expectException(Warning::class);
+        if (method_exists($this, 'expectWarning')) {
+            $this->expectWarning();
+        } else {
+            $this->expectException(Warning::class);
+        }
 
         $formatter->format($value, NumberFormatter::TYPE_CURRENCY);
     }
@@ -699,7 +703,11 @@ public function parseProvider()
 
     public function testParseTypeDefault()
     {
-        $this->expectException(Warning::class);
+        if (method_exists($this, 'expectWarning')) {
+            $this->expectWarning();
+        } else {
+            $this->expectException(Warning::class);
+        }
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_DEFAULT);
@@ -819,7 +827,11 @@ public function parseTypeDoubleProvider()
 
     public function testParseTypeCurrency()
     {
-        $this->expectException(Warning::class);
+        if (method_exists($this, 'expectWarning')) {
+            $this->expectWarning();
+        } else {
+            $this->expectException(Warning::class);
+        }
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_CURRENCY);