diff --git a/NEWS b/NEWS index 36348a5b058..6745647a00e 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,9 @@ PHP NEWS . Fixed bug #79112 (IMAP extension can't find OpenSSL libraries at configure time). (Nikita) + -Intl: + . Fixed bug #79212 (NumberFormatter::format() may detect wrong type). (cmb) + - MBString: . Fixed bug #79149 (SEGV in mb_convert_encoding with non-string encodings). (cmb) diff --git a/ext/intl/formatter/formatter_format.c b/ext/intl/formatter/formatter_format.c index 05ef6789ef9..0b0c9029e61 100644 --- a/ext/intl/formatter/formatter_format.c +++ b/ext/intl/formatter/formatter_format.c @@ -53,23 +53,23 @@ PHP_FUNCTION( numfmt_format ) /* Fetch the object. */ FORMATTER_METHOD_FETCH_OBJECT; - if(type == FORMAT_TYPE_DEFAULT) { - if(Z_TYPE_P(number) == IS_STRING) { - convert_scalar_to_number_ex(number); - } - - if(Z_TYPE_P(number) == IS_LONG) { - /* take INT32 on 32-bit, int64 on 64-bit */ - type = (sizeof(zend_long) == 8)?FORMAT_TYPE_INT64:FORMAT_TYPE_INT32; - } else if(Z_TYPE_P(number) == IS_DOUBLE) { - type = FORMAT_TYPE_DOUBLE; - } else { - type = FORMAT_TYPE_INT32; - } + if(Z_TYPE_P(number) != IS_ARRAY) { + convert_scalar_to_number_ex(number); + } else { + convert_to_long(number); } - if(Z_TYPE_P(number) != IS_DOUBLE && Z_TYPE_P(number) != IS_LONG) { - convert_scalar_to_number(number ); + if(type == FORMAT_TYPE_DEFAULT) { + switch(Z_TYPE_P(number)) { + case IS_LONG: + /* take INT32 on 32-bit, int64 on 64-bit */ + type = (sizeof(zend_long) == 8)?FORMAT_TYPE_INT64:FORMAT_TYPE_INT32; + break; + case IS_DOUBLE: + type = FORMAT_TYPE_DOUBLE; + break; + EMPTY_SWITCH_DEFAULT_CASE(); + } } switch(type) { diff --git a/ext/intl/tests/bug79212.phpt b/ext/intl/tests/bug79212.phpt new file mode 100644 index 00000000000..0f7897acc4a --- /dev/null +++ b/ext/intl/tests/bug79212.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #79212 (NumberFormatter::format() may detect wrong type) +--SKIPIF-- + +--FILE-- +format(gmp_init('823749273428379492374'))); + +$fmt = new NumberFormatter('en_US', NumberFormatter::PATTERN_DECIMAL); +var_dump($fmt->format([1], NumberFormatter::TYPE_INT64)); +?> +--EXPECT-- +string(21) "823749273428379400000" +string(1) "1"