Skip to content

ext/int: IntlTimeZone converting few intl error to exceptions. #13477

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

Merged
merged 5 commits into from
Aug 9, 2025
Merged

ext/int: IntlTimeZone converting few intl error to exceptions. #13477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b3cb4b
ext/int: IntlTimeZone converting few intl error to exceptions.
devnexen Feb 22, 2024
2284a66
changes from remarks
devnexen Feb 24, 2024
28c6cdb
forgotten change
devnexen Aug 9, 2025
53db5dd
fix wrong offset argument for intltz_create_time_zone_id_enumeration
devnexen Aug 9, 2025
d446c08
fix test
devnexen Aug 9, 2025
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
2 changes: 1 addition & 1 deletion ext/intl/tests/timezone_createTimeZoneIDEnumeration_error_64bit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ try {
}
?>
--EXPECT--
ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #1 ($type) must be between -2147483648 and 2147483647
ValueError: IntlTimeZone::createTimeZoneIDEnumeration(): Argument #3 ($rawOffset) must be between -2147483648 and 2147483647
12 changes: 6 additions & 6 deletions ext/intl/timezone/timezone_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)

tzobj = Z_PHPTIMEZONE_P(zv_timezone);
if (!tzobj->initialized) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"DateTimeZone object is unconstructed");
RETURN_NULL();
zend_throw_error(NULL, "DateTimeZone object is unconstructed");
RETURN_THROWS();
}

tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL);
Expand Down Expand Up @@ -209,7 +208,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)

if (!arg3isnull) {
if (UNEXPECTED(ZEND_LONG_EXCEEDS_INT(offset_arg))) {
zend_argument_value_error(1, "must be between %d and %d", INT32_MIN, INT32_MAX);
zend_argument_value_error(3, "must be between %d and %d", INT32_MIN, INT32_MAX);
RETURN_THROWS();
}
offset = static_cast<int32_t>(offset_arg);
Expand Down Expand Up @@ -311,8 +310,9 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
Z_PARAM_LONG(index)
ZEND_PARSE_PARAMETERS_END();

if (UNEXPECTED(index < (zend_long)INT32_MIN || index > (zend_long)INT32_MAX)) {
RETURN_FALSE;
if (UNEXPECTED(ZEND_LONG_EXCEEDS_INT(index))) {
zend_argument_value_error(2, "must be between %d and %d", INT32_MIN, INT32_MAX);
RETURN_THROWS();
}

UErrorCode status = UErrorCode();
Expand Down