php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-13 02:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Fix the DateTimeZone::getTransitions() algorithm.

Browse Source
This commit is contained in:
Derick Rethans
2008-03-20 19:43:36 +00:00
parent e6831f4b4f
commit b23442fc48
1 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
ext/date/php_date.c
View File

@@ -2604,7 +2604,7 @@ PHP_FUNCTION(timezone_transitions_get)
{
zval *object, *element;
php_timezone_obj *tzobj;
int i, first = 1;
int i, begin = 0, found;
long timestamp_begin = LONG_MIN, timestamp_end = LONG_MAX;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ll", &object, date_ce_timezone, &timestamp_begin, &timestamp_end) == FAILURE) {
@@ -2616,31 +2616,64 @@ PHP_FUNCTION(timezone_transitions_get)
RETURN_FALSE;
}
#define add_nominal() \
MAKE_STD_ZVAL(element); \
array_init(element); \
add_assoc_long(element, "ts", timestamp_begin); \
add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0); \
add_assoc_long(element, "offset", tzobj->tzi.tz->type[0].offset); \
add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[0].isdst); \
add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx], 1); \
add_next_index_zval(return_value, element);
#define add(i,ts) \
MAKE_STD_ZVAL(element); \
array_init(element); \
add_assoc_long(element, "ts", ts); \
add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0 TSRMLS_CC), 0); \
add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \
add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \
add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx], 1); \
add_next_index_zval(return_value, element);
#define add_last() add(tzobj->tzi.tz->timecnt - 1, timestamp_begin)
array_init(return_value);
for (i = 0; i < tzobj->tzi.tz->timecnt; ++i) {
if (tzobj->tzi.tz->trans[i] >= timestamp_begin && tzobj->tzi.tz->trans[i] < timestamp_end) {
if (first && timestamp_begin != LONG_MIN && i > 0 && timestamp_begin != tzobj->tzi.tz->trans[i])
{
MAKE_STD_ZVAL(element);
array_init(element);
add_assoc_long(element, "ts", timestamp_begin);
add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0);
add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i-1]].offset);
add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i-1]].isdst);
add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i-1]].abbr_idx], 1);
add_next_index_zval(return_value, element);
if (timestamp_begin == LONG_MIN) {
add_nominal();
begin = 0;
found = 1;
} else {
begin = 0;
found = 0;
if (tzobj->tzi.tz->timecnt > 0) {
do {
if (tzobj->tzi.tz->trans[begin] > timestamp_begin) {
if (begin > 0) {
add(begin - 1, timestamp_begin);
} else {
add_nominal();
}
found = 1;
break;
}
begin++;
} while (begin < tzobj->tzi.tz->timecnt);
}
}
if (!found) {
if (tzobj->tzi.tz->timecnt > 0) {
add_last();
} else {
add_nominal();
}
} else {
for (i = begin; i < tzobj->tzi.tz->timecnt; ++i) {
if (tzobj->tzi.tz->trans[i] < timestamp_end) {
add(i, tzobj->tzi.tz->trans[i]);
}
MAKE_STD_ZVAL(element);
array_init(element);
add_assoc_long(element, "ts", tzobj->tzi.tz->trans[i]);
add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, tzobj->tzi.tz->trans[i], 0 TSRMLS_CC), 0);
add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset);
add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst);
add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx], 1);
add_next_index_zval(return_value, element);
first = 0;
}
}
}