Skip to content

Fix GH-13857: date_diff with different timezones returns wrong result. #20997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khaledalam wants to merge 2 commits into
base: master
Choose a base branch
from
+42 −0
Open

Fix GH-13857: date_diff with different timezones returns wrong result. #20997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d69aac4
Fix GH-13857: date_diff with different timezones returns wrong result.
khaledalam Jan 21, 2026
a26f50a
ci/cd: re trigger ci/cd.
khaledalam Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ext/date/lib/interval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ static timelib_rel_time *timelib_diff_with_tzid(timelib_time *one, timelib_time
timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)
{
timelib_rel_time *rt;
timelib_sll sse_diff;

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);
Expand All @@ -172,6 +173,17 @@ timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)

rt->days = timelib_diff_days(one, two);

/* Use SSE diff when wall-clock dates are inverted */
if ((rt->y < 0 || (rt->y == 0 && rt->m < 0)) && (sse_diff = two->sse - one->sse) >= 0) {
rt->y = rt->m = rt->d = 0;
rt->h = sse_diff / 3600;
rt->i = (sse_diff % 3600) / 60;
rt->s = sse_diff % 60;
rt->days = sse_diff / 86400;
timelib_do_rel_normalize(two, rt);
return rt;
}

timelib_do_rel_normalize(rt->invert ? one : two, rt);

return rt;
Expand Down
30 changes: 30 additions & 0 deletions ext/date/tests/gh13857.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
Bug GH-13857 (Unexpected Results with date_diff for Different Timezones) wall-clock dates are inverted.
--FILE--
<?php
date_default_timezone_set('Asia/Tokyo');
$nowDate = (new DateTime('2024-04-01 00:49:22'))->setTimeZone(new DateTimeZone('Asia/Tokyo'));
$endDate = (new DateTime('2024-04-01 08:48:22'))->setTimeZone(new DateTimeZone('UTC'));

echo "nowDate: ", $nowDate->format('Y-m-d H:i:s T'), "\n";
echo "endDate: ", $endDate->format('Y-m-d H:i:s T'), "\n";

$diff = date_diff($nowDate, $endDate);
echo "diff: ", $diff->format('%R %Y-%M-%D %H:%I:%S'), "\n";
echo "days: ", $diff->days, "\n";

$diff2 = date_diff($endDate, $nowDate);
echo "reversed: ", $diff2->format('%R %Y-%M-%D %H:%I:%S'), "\n";

$a = new DateTime('2024-04-01 00:49:22', new DateTimeZone('+09:00'));
$b = new DateTime('2024-03-31 23:48:22', new DateTimeZone('+00:00'));
$diff3 = $a->diff($b);
echo "offset TZ: ", $diff3->format('%R %Y-%M-%D %H:%I:%S'), "\n";
?>
--EXPECT--
nowDate: 2024-04-01 00:49:22 JST
endDate: 2024-03-31 23:48:22 UTC
diff: + 00-00-00 07:59:00
days: 0
reversed: - 00-00-00 07:59:00
offset TZ: + 00-00-00 07:59:00
Loading