Remove constraint for PHP < 8

Author: jderusse

NumberFormatter/NumberFormatter.php

@@ -356,13 +356,7 @@ 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;
+            throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%s given).', $type));
         }
 
         if (self::CURRENCY === $this->style) {
@@ -514,13 +508,7 @@ 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;
+            throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%d given).', $type));
         }
 
         // Any invalid number at the end of the string is removed.

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -326,13 +326,7 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        if (\PHP_VERSION_ID >= 80000) {
-            $this->expectException(\ValueError::class);
-        } elseif (method_exists($this, 'expectWarning')) {
-            $this->expectWarning();
-        } else {
-            $this->expectException(Warning::class);
-        }
+        $this->expectException(\ValueError::class);
 
         $formatter->format($value, NumberFormatter::TYPE_CURRENCY);
     }
@@ -342,9 +336,7 @@ public function testFormatTypeCurrency($formatter, $value)
      */
     public function testFormatTypeCurrencyReturn($formatter, $value)
     {
-        if (\PHP_VERSION_ID >= 80000) {
-            $this->expectException(\ValueError::class);
-        }
+        $this->expectException(\ValueError::class);
 
         $this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
     }
@@ -705,13 +697,7 @@ public function parseProvider()
 
     public function testParseTypeDefault()
     {
-        if (\PHP_VERSION_ID >= 80000) {
-            $this->expectException(\ValueError::class);
-        } elseif (method_exists($this, 'expectWarning')) {
-            $this->expectWarning();
-        } else {
-            $this->expectException(Warning::class);
-        }
+        $this->expectException(\ValueError::class);
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_DEFAULT);
@@ -831,13 +817,7 @@ public function parseTypeDoubleProvider()
 
     public function testParseTypeCurrency()
     {
-        if (\PHP_VERSION_ID >= 80000) {
-            $this->expectException(\ValueError::class);
-        } elseif (method_exists($this, 'expectWarning')) {
-            $this->expectWarning();
-        } else {
-            $this->expectException(Warning::class);
-        }
+        $this->expectException(\ValueError::class);
 
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $formatter->parse('1', NumberFormatter::TYPE_CURRENCY);