Different approach

Author: marc-mabe

ext/date/php_date.c

@@ -4264,7 +4264,7 @@ PHP_FUNCTION(timezone_transitions_get)
 	uint64_t             begin = 0;
 	bool                 found;
 	zend_long            timestamp_begin = ZEND_LONG_MIN, timestamp_end = INT32_MAX;
-	zend_long            timestamp_added_last = ZEND_LONG_MIN;
+	zend_long            last_transition_ts = ZEND_LONG_MIN;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ll", &object, date_ce_timezone, &timestamp_begin, &timestamp_end) == FAILURE) {
 		RETURN_THROWS();
@@ -4282,44 +4282,34 @@ PHP_FUNCTION(timezone_transitions_get)
 		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]); \
-		add_next_index_zval(return_value, &element); \
-		timestamp_added_last = timestamp_begin;
+		add_next_index_zval(return_value, &element);
 
 #define add(i,ts) \
-		if (ts > timestamp_added_last) { \
-			array_init(&element); \
-			add_assoc_long(&element, "ts",     ts); \
-			add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 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]); \
-			add_next_index_zval(return_value, &element); \
-			timestamp_added_last = ts; \
-		}
+		array_init(&element); \
+		add_assoc_long(&element, "ts",     ts); \
+		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 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]); \
+		add_next_index_zval(return_value, &element);
 
 #define add_by_index(i,ts) \
-		if (ts > timestamp_added_last) { \
-			array_init(&element); \
-			add_assoc_long(&element, "ts",     ts); \
-			add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
-			add_assoc_long(&element, "offset", tzobj->tzi.tz->type[i].offset); \
-			add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[i].isdst); \
-			add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[i].abbr_idx]); \
-			add_next_index_zval(return_value, &element); \
-			timestamp_added_last = ts; \
-		}
+		array_init(&element); \
+		add_assoc_long(&element, "ts",     ts); \
+		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
+		add_assoc_long(&element, "offset", tzobj->tzi.tz->type[i].offset); \
+		add_assoc_bool(&element, "isdst",  tzobj->tzi.tz->type[i].isdst); \
+		add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[i].abbr_idx]); \
+		add_next_index_zval(return_value, &element);
 
 #define add_from_tto(to,ts) \
-		if (ts > timestamp_added_last) { \
-			array_init(&element); \
-			add_assoc_long(&element, "ts",     ts); \
-			add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
-			add_assoc_long(&element, "offset", (to)->offset); \
-			add_assoc_bool(&element, "isdst",  (to)->is_dst); \
-			add_assoc_string(&element, "abbr", (to)->abbr); \
-			add_next_index_zval(return_value, &element); \
-			timestamp_added_last = ts; \
-		}
+		array_init(&element); \
+		add_assoc_long(&element, "ts",     ts); \
+		add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601_LARGE_YEAR, 13, ts, 0)); \
+		add_assoc_long(&element, "offset", (to)->offset); \
+		add_assoc_bool(&element, "isdst",  (to)->is_dst); \
+		add_assoc_string(&element, "abbr", (to)->abbr); \
+		add_next_index_zval(return_value, &element);
 
 #define add_last() add(tzobj->tzi.tz->bit64.timecnt - 1, timestamp_begin)
 
@@ -4337,8 +4327,10 @@ PHP_FUNCTION(timezone_transitions_get)
 				if (tzobj->tzi.tz->trans[begin] > timestamp_begin) {
 					if (begin > 0) {
 						add(begin - 1, timestamp_begin);
+						last_transition_ts = timestamp_begin;
 					} else {
 						add_nominal();
+						last_transition_ts = timestamp_begin;
 					}
 					found = 1;
 					break;
@@ -4354,24 +4346,31 @@ PHP_FUNCTION(timezone_transitions_get)
 				timelib_time_offset *tto = timelib_get_time_zone_info(timestamp_begin, tzobj->tzi.tz);
 				add_from_tto(tto, timestamp_begin);
 				timelib_time_offset_dtor(tto);
+				last_transition_ts = timestamp_begin;
 			} else {
 				add_last();
+				last_transition_ts = timestamp_begin;
 			}
 		} else {
 			add_nominal();
+			last_transition_ts = timestamp_begin;
 		}
 	} else {
 		for (uint64_t i = begin; i < tzobj->tzi.tz->bit64.timecnt; ++i) {
-			if (tzobj->tzi.tz->trans[i] < timestamp_end) {
-				add(i, tzobj->tzi.tz->trans[i]);
-			} else {
+			if (tzobj->tzi.tz->trans[i] > timestamp_end) {
 				return;
 			}
+
+			if (tzobj->tzi.tz->trans[i] > timestamp_begin) {
+				add(i, tzobj->tzi.tz->trans[i]);
+			}
 		}
+
+		last_transition_ts = tzobj->tzi.tz->trans[tzobj->tzi.tz->bit64.timecnt - 1];
 	}
+
 	if (tzobj->tzi.tz->posix_info && tzobj->tzi.tz->posix_info->dst_end) {
 		timelib_sll start_y, end_y, dummy_m, dummy_d;
-		timelib_sll last_transition_ts = tzobj->tzi.tz->trans[tzobj->tzi.tz->bit64.timecnt - 1];
 
 		/* Find out year for last transition */
 		timelib_unixtime2date(last_transition_ts, &start_y, &dummy_m, &dummy_d);

ext/date/tests/bug80963.phpt

@@ -27,7 +27,7 @@ array(5) {
   ["abbr"]=>
   string(3) "GMT"
 }
-int(237)
+int(23%d)
 array(5) {
   ["ts"]=>
   int(2140668000)
@@ -40,7 +40,7 @@ array(5) {
   ["abbr"]=>
   string(3) "EST"
 }
-int(144)
+int(14%d)
 array(5) {
   ["ts"]=>
   int(2140045200)