Merge remote-tracking branch 'derickr/timelib-2021.18' into PHP-8.1

Author: derickr

NEWS

@@ -10,6 +10,15 @@ PHP                                                                        NEWS
   . Fixed bug GH-9650 (Can't initialize heap: [0x000001e7]). (Michael Voříšek)
   . Fixed potentially undefined behavior in Windows ftok(3) emulation. (cmb)
 
+- Date:
+  . Fixed bug GH-9699 (DateTimeImmutable::diff differences in 8.1.10 onwards -
+    timezone related). (Derick)
+  . Fixed bug GH-9700 (DateTime::createFromFormat: Parsing TZID string is too
+    greedy). (Derick)
+  . Fixed bug GH-9866 (Time zone bug with \DateTimeInterface::diff()). (Derick)
+  . Fixed bug GH-9880 (DateTime diff returns wrong sign on day count when using
+    a timezone). (Derick)
+
 - FPM:
   . Fixed bug GH-9959 (Solaris port event mechanism is still broken after bug
     #66694). (Petr Sumbera)

ext/date/lib/interval.c

@@ -62,7 +62,7 @@ static void sort_old_to_new(timelib_time **one, timelib_time **two, timelib_rel_
 	if (
 		(*one)->zone_type == TIMELIB_ZONETYPE_ID &&
 		(*two)->zone_type == TIMELIB_ZONETYPE_ID &&
-		(strcmp((*one)->tz_info->name, (*two)->tz_info->name) != 0)
+		(strcmp((*one)->tz_info->name, (*two)->tz_info->name) == 0)
 	) {
 		if (
 			((*one)->y > (*two)->y) ||
@@ -200,7 +200,7 @@ timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)
 {
 	timelib_rel_time *rt;
 
-	if (one->zone_type == TIMELIB_ZONETYPE_ID && two->zone_type == TIMELIB_ZONETYPE_ID) {
+	if (one->zone_type == TIMELIB_ZONETYPE_ID && two->zone_type == TIMELIB_ZONETYPE_ID && strcmp(one->tz_info->name, two->tz_info->name) == 0) {
 		return timelib_diff_with_tzid(one, two);
 	}