Merge branch '4.4' into 5.1

* 4.4:
  [Intl] promote warnings to value errors on PHP 8
  Fix CS
  DateTime validator support for trailing data
  Remove some leftover for HHVM support
  Simplify code
  Fix tests on 5.6
  [Debug] Skip a test that was meant for HHVM.
  [Console] Silence warnings on sapi_windows_cp_set() call
  guard $argv + $token against null, preventing unnecessary exceptions

Author: xabbuh

NumberFormatter/NumberFormatter.php

@@ -354,6 +354,10 @@ public function format($value, int $type = self::TYPE_DEFAULT)
     {
         // The original NumberFormatter does not support this format type
         if (self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%s given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -508,6 +512,10 @@ public function parseCurrency(string $value, string &$currency, int &$position =
     public function parse(string $value, int $type = self::TYPE_DOUBLE, int &$position = 0)
     {
         if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%d given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -324,7 +324,9 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -338,6 +340,10 @@ public function testFormatTypeCurrency($formatter, $value)
      */
     public function testFormatTypeCurrencyReturn($formatter, $value)
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        }
+
         $this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
     }
 
@@ -699,7 +705,9 @@ public function parseProvider()
 
     public function testParseTypeDefault()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -823,7 +831,9 @@ public function parseTypeDoubleProvider()
 
     public function testParseTypeCurrency()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);