Fixed phpGH-9699, phpGH-9866, and phpGH-9880 (problems with diff); and phpGH-9700 (greedy tzid parsing)

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/tests/gh9699.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Bug GH-9699 (DateTimeImmutable::diff differences in 8.1.10 onwards - timezone related)
+--FILE--
+<?php
+
+$date = new DateTimeImmutable('2022-10-09 02:41:54.515330', new DateTimeZone('America/Los_Angeles'));
+$now = new DateTimeImmutable('2022-10-10 08:41:54.534620', new DateTimeZone('UTC'));
+
+echo $date->diff($now)->format("%R %Y %M %D %H %I %S %F"), "\n";
+?>
+--EXPECT--
++ 00 00 00 23 00 00 019290

ext/date/tests/gh9700.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug GH-9700 (DateTime::createFromFormat: Parsing TZID string is too greedy)
+--FILE--
+<?php
+var_dump(DateTime::createFromFormat('Y-m-d\TH:i:sP[e]', '2022-02-18T00:00:00+01:00[Europe/Berlin]'));
+?>
+--EXPECTF--
+object(DateTime)#%d (%d) {
+  ["date"]=>
+  string(26) "2022-02-18 00:00:00.000000"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/Berlin"
+}

ext/date/tests/gh9866.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug GH-9866 (Time zone bug with \DateTimeInterface::diff())
+--FILE--
+<?php
+function getYearsBetween(
+    \DateTimeImmutable $startDate,
+    \DateTimeImmutable $endDate,
+): int {
+    $dateInterval = $startDate->diff($endDate, true);
+    return $dateInterval->y;
+}
+
+$start = new \DateTimeImmutable('2000-11-01 09:29:22.907606', new \DateTimeZone('America/Chicago'));
+$end = new \DateTimeImmutable('2022-06-06 11:00:00.000000', new \DateTimeZone('America/New_York'));
+$result = getYearsBetween($start, $end);
+var_dump($result);
+$diff = $start->diff($end);
+echo $diff->format("%R %Y %M %D (%a) %H %I %S %F"), "\n";
+?>
+--EXPECT--
+int(21)
++ 21 07 04 (7886) 23 30 37 092394

ext/date/tests/gh9880.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug GH-9880 (DateTime diff returns wrong sign on day count when using a timezone)
+--FILE--
+<?php
+
+ini_set('date.timezone', 'America/Los_Angeles');
+
+$nowTime = new DateTime();
+$nowTime->setTimestamp(1667416695);
+
+$dateTime = new DateTime();
+$dateTime->setTimestamp(1671904800);
+$dateTime->setTimezone(new DateTimeZone('America/New_York'));
+
+echo $dateTime->diff($nowTime)->format('%R %a %H %I %S'), "\n";
+?>
+--EXPECT--
+- 51 22 41 45