[Intl] promote warnings to value errors on PHP 8
This commit is contained in:
parent
799624b6f1
commit
82d9d41d57
@ -357,6 +357,10 @@ class NumberFormatter
|
|||||||
|
|
||||||
// The original NumberFormatter does not support this format type
|
// The original NumberFormatter does not support this format type
|
||||||
if (self::TYPE_CURRENCY === $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);
|
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -513,6 +517,10 @@ class NumberFormatter
|
|||||||
$type = (int) $type;
|
$type = (int) $type;
|
||||||
|
|
||||||
if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
|
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);
|
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -324,7 +324,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testFormatTypeCurrency($formatter, $value)
|
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();
|
$this->expectWarning();
|
||||||
} else {
|
} else {
|
||||||
$this->expectException(Warning::class);
|
$this->expectException(Warning::class);
|
||||||
@ -338,6 +340,10 @@ abstract class AbstractNumberFormatterTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testFormatTypeCurrencyReturn($formatter, $value)
|
public function testFormatTypeCurrencyReturn($formatter, $value)
|
||||||
{
|
{
|
||||||
|
if (\PHP_VERSION_ID >= 80000) {
|
||||||
|
$this->expectException(\ValueError::class);
|
||||||
|
}
|
||||||
|
|
||||||
$this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
|
$this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -709,7 +715,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
|
|||||||
|
|
||||||
public function testParseTypeDefault()
|
public function testParseTypeDefault()
|
||||||
{
|
{
|
||||||
if (method_exists($this, 'expectWarning')) {
|
if (\PHP_VERSION_ID >= 80000) {
|
||||||
|
$this->expectException(\ValueError::class);
|
||||||
|
} elseif (method_exists($this, 'expectWarning')) {
|
||||||
$this->expectWarning();
|
$this->expectWarning();
|
||||||
} else {
|
} else {
|
||||||
$this->expectException(Warning::class);
|
$this->expectException(Warning::class);
|
||||||
@ -833,7 +841,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
|
|||||||
|
|
||||||
public function testParseTypeCurrency()
|
public function testParseTypeCurrency()
|
||||||
{
|
{
|
||||||
if (method_exists($this, 'expectWarning')) {
|
if (\PHP_VERSION_ID >= 80000) {
|
||||||
|
$this->expectException(\ValueError::class);
|
||||||
|
} elseif (method_exists($this, 'expectWarning')) {
|
||||||
$this->expectWarning();
|
$this->expectWarning();
|
||||||
} else {
|
} else {
|
||||||
$this->expectException(Warning::class);
|
$this->expectException(Warning::class);
|
||||||
|
Reference in New Issue
Block a user