Skip to content

ext/intl: Preserve int64 precision in IntlNumberRangeFormatter::format() #22202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LamentXU123 wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −2
Open

ext/intl: Preserve int64 precision in IntlNumberRangeFormatter::format() #22202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ext/intl/rangeformatter/rangeformatter_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,19 @@ zend_object *IntlNumberRangeFormatter_object_create(zend_class_entry *ce)
return &intern->zo;
}

static icu::Formattable rangeformatter_create_formattable(zval *number)
{
icu::Formattable formattable;

if (Z_TYPE_P(number) == IS_DOUBLE) {
formattable.setDouble(Z_DVAL_P(number));
} else {
formattable.setInt64(static_cast<int64_t>(Z_LVAL_P(number)));
}

return formattable;
}

U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, __construct)
{
ZEND_PARSE_PARAMETERS_NONE();
Expand Down Expand Up @@ -154,8 +167,8 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, format)

UErrorCode error = U_ZERO_ERROR;

icu::Formattable start_formattable(Z_TYPE_P(start) == IS_DOUBLE ? Z_DVAL_P(start) : Z_LVAL_P(start));
icu::Formattable end_formattable(Z_TYPE_P(end) == IS_DOUBLE ? Z_DVAL_P(end) : Z_LVAL_P(end));
icu::Formattable start_formattable = rangeformatter_create_formattable(start);
icu::Formattable end_formattable = rangeformatter_create_formattable(end);

UnicodeString result = RANGEFORMATTER_OBJECT(obj)->formatFormattableRange(start_formattable, end_formattable, error).toString(error);

Expand Down
27 changes: 27 additions & 0 deletions ext/intl/tests/rangeformatter/rangeformatter_format_int64.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
IntlNumberRangeFormatter::format() preserves int64 precision
--EXTENSIONS--
intl
--SKIPIF--
<?php
if (!class_exists('IntlNumberRangeFormatter')) {
die('skip IntlNumberRangeFormatter not available');
}
if (PHP_INT_SIZE < 8) {
die('skip 64-bit only');
}
?>
--FILE--
<?php
$formatter = IntlNumberRangeFormatter::createFromSkeleton(
'',
'en_US',
IntlNumberRangeFormatter::COLLAPSE_AUTO,
IntlNumberRangeFormatter::IDENTITY_FALLBACK_SINGLE_VALUE
);

$formatted = $formatter->format(9007199254740993, 9007199254740993);
var_dump(preg_replace('/[^0-9]/', '', $formatted));
?>
--EXPECT--
string(16) "9007199254740993"
Loading