archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/intl: Refactor timezone parameter passing (#19409)

Browse source
This commit is contained in:
Gina Peter Banyard 2025-08-08 21:12:43 +01:00 • committed by GitHub
parent be2889411a
commit 43a91089ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 207 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/intl/dateformat/dateformat_create.cpp
View file

@ -59,7 +59,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
Calendar *cal = NULL;
zend_long calendar_type;
bool calendar_owned;
zval *timezone_zv = NULL;
zend_object *timezone_object = nullptr;
zend_string *timezone_string = nullptr;
TimeZone *timezone = NULL;
bool explicit_tz;
char* pattern_str = NULL;
@ -76,7 +77,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(date_type)
Z_PARAM_LONG(time_type)
Z_PARAM_ZVAL(timezone_zv)
Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
Z_PARAM_OBJ_OF_CLASS_OR_LONG_OR_NULL(calendar_obj, Calendar_ce_ptr, calendar_long, calendar_is_null)
Z_PARAM_STRING_OR_NULL(pattern_str, pattern_str_len)
ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
@ -120,13 +121,12 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
}
/* process timezone */
explicit_tz = timezone_zv != NULL && Z_TYPE_P(timezone_zv) != IS_NULL;
explicit_tz = timezone_object != nullptr || timezone_string != nullptr;
if (explicit_tz || calendar_owned ) {
//we have an explicit time zone or a non-object calendar
timezone = timezone_process_timezone_argument(timezone_zv,
INTL_DATA_ERROR_P(dfo));
if (timezone == NULL) {
timezone = timezone_process_timezone_argument(timezone_object, timezone_string, INTL_DATA_ERROR_P(dfo));
if (timezone == nullptr) {
goto error;
}
}