@@ -82,9 +82,8 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
82
82
83
83
tzobj = Z_PHPTIMEZONE_P (zv_timezone);
84
84
if (!tzobj->initialized ) {
85
- intl_error_set (NULL , U_ILLEGAL_ARGUMENT_ERROR,
86
- " DateTimeZone object is unconstructed" );
87
- RETURN_NULL ();
85
+ zend_throw_error (NULL , " DateTimeZone object is unconstructed" );
86
+ RETURN_THROWS ();
88
87
}
89
88
90
89
tz = timezone_convert_datetimezone (tzobj->type , tzobj, false , NULL );
@@ -209,7 +208,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
209
208
210
209
if (!arg3isnull) {
211
210
if (UNEXPECTED (ZEND_LONG_EXCEEDS_INT (offset_arg))) {
212
- zend_argument_value_error (1 , " must be between %d and %d" , INT32_MIN, INT32_MAX);
211
+ zend_argument_value_error (3 , " must be between %d and %d" , INT32_MIN, INT32_MAX);
213
212
RETURN_THROWS ();
214
213
}
215
214
offset = static_cast <int32_t >(offset_arg);
@@ -311,8 +310,9 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
311
310
Z_PARAM_LONG (index)
312
311
ZEND_PARSE_PARAMETERS_END ();
313
312
314
- if (UNEXPECTED (index < (zend_long)INT32_MIN || index > (zend_long)INT32_MAX)) {
315
- RETURN_FALSE;
313
+ if (UNEXPECTED (ZEND_LONG_EXCEEDS_INT (index))) {
314
+ zend_argument_value_error (2 , " must be between %d and %d" , INT32_MIN, INT32_MAX);
315
+ RETURN_THROWS ();
316
316
}
317
317
318
318
UErrorCode status = UErrorCode ();
0 commit comments