Skip to content

Fixed PHP GH-13857: Fix diff results with dates from different timezones span a month and day boundary #152

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
wants to merge 1 commit into
base: v2022
Choose a base branch
from
Open

Fixed PHP GH-13857: Fix diff results with dates from different timezones span a month and day boundary #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 51 additions & 0 deletions tests/c/diff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,3 +428,54 @@ TEST(timelib_diff, test_time_fall_type2_stsec_type2_dtsec)
test_parse("America/New_York", "2010-11-07 01:00:00 EST", "2010-11-07 01:59:59 EDT");
CHECKDIFF(0, 0, 0, 0, 0, 1, 0);
}


TEST(timelib_diff, php_gh13857a)
{
test_parse("Asia/Tokyo", "UTC", "2024-04-01 00:49:22", "2024-03-31 23:48:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857b)
{
test_parse("Asia/Tokyo", "UTC", "2024-01-01 00:49:22", "2023-12-31 23:48:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857c)
{
test_parse("Asia/Tokyo", "UTC", "2023-12-01 00:49:22", "2023-11-30 23:48:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857d)
{
test_parse("Asia/Tokyo", "UTC", "2024-02-01 00:49:22", "2024-01-31 23:48:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}


TEST(timelib_diff, php_gh13857e)
{
test_parse("UTC", "Asia/Tokyo", "2024-03-31 23:48:22", "2024-04-01 00:49:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857f)
{
test_parse("UTC", "Asia/Tokyo", "2023-12-31 23:48:22", "2024-01-01 00:49:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857g)
{
test_parse("UTC", "Asia/Tokyo", "2023-11-30 23:48:22", "2023-12-01 00:49:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

TEST(timelib_diff, php_gh13857h)
{
test_parse("UTC", "Asia/Tokyo", "2024-01-31 23:48:22", "2024-02-01 00:49:22");
CHECKDIFF(0, 0, 0, 7, 59, 0, 0);
}

22 changes: 21 additions & 1 deletion tm2unixtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,20 @@ static void do_range_limit_days_relative(timelib_sll *base_y, timelib_sll *base_
/*
printf( "S: Y%d M%d %d %d %d %d\n", year, month, *y, *m, *d, days);
*/
if (*y == -1 && *m == 11 && *d == 31) {
(*y) = 0;
(*m) = 0;
(*d) = 0;
}
if (!invert) {
if (*m == -1) {
leapyear = timelib_is_leap(year);
days = leapyear ? days_in_month_leap[month] : days_in_month[month];
if (*d >= days) {
*d -= days;
(*m)++;
}
}
while (*d < 0) {
dec_month(&year, &month);
leapyear = timelib_is_leap(year);
Expand All @@ -93,6 +106,14 @@ static void do_range_limit_days_relative(timelib_sll *base_y, timelib_sll *base_
(*m)--;
}
} else {
if (*m == -1 && month > 1) {
leapyear = timelib_is_leap(year);
days = leapyear ? days_in_month_leap[month + *m] : days_in_month[month + *m];
if (*d >= days) {
*d -= days;
(*m)++;
}
}
while (*d < 0) {
leapyear = timelib_is_leap(year);
days = leapyear ? days_in_month_leap[month] : days_in_month[month];
Expand Down Expand Up @@ -191,7 +212,6 @@ void timelib_do_rel_normalize(timelib_time *base, timelib_rel_time *rt)
do_range_limit(0, 60, 60, &rt->s, &rt->i);
do_range_limit(0, 60, 60, &rt->i, &rt->h);
do_range_limit(0, 24, 24, &rt->h, &rt->d);
do_range_limit(0, 12, 12, &rt->m, &rt->y);

do_range_limit_days_relative(&base->y, &base->m, &rt->y, &rt->m, &rt->d, rt->invert);
do_range_limit(0, 12, 12, &rt->m, &rt->y);
Expand Down