Fix GH-21616: DateTime::modify() wrong timestamp across DST transitions#21669
Open
MarcusXavierr wants to merge 6 commits intophp:PHP-8.4from
Open
Fix GH-21616: DateTime::modify() wrong timestamp across DST transitions#21669MarcusXavierr wants to merge 6 commits intophp:PHP-8.4from
MarcusXavierr wants to merge 6 commits intophp:PHP-8.4from
Conversation
do_adjust_relative() adds h/i/s to wall-clock fields before converting to a Unix timestamp. Near a spring-forward gap that produces a nonexistent time, which resolves to the wrong offset. Fix: zero out relative h/i/s/us before timelib_update_ts(), apply them to sse directly. Same technique as timelib_add_wall(). y/m/d, weekday relatives, and first_last_day_of still go through timelib_update_ts. Also fixes phpGH-15880.
Always fold microseconds into seconds before SSE arithmetic instead of guarding with if-checks. Handle negative remainders correctly.
Remove section headers and redundant cases. Add -72h backward through fall-back, +61 minutes across spring-forward gap, and DateTimeImmutable.
Fix/gh 21616 84
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DateTime::modify()with relative h/i/s strings produces wrong timestamps near DST transitions.do_adjust_relative()adds hours, minutes, and seconds to wall-clock fields beforetimelib_update_ts()converts to a Unix timestamp. Near a spring-forward gap, thatintermediate wall-clock time is ambiguous and resolves to the wrong side.
add()/sub()don't have this problem —timelib_add_wall()adds h/i/s directly to SSE.In
php_date_modify(), striph,i,s, andusfrom the relative struct beforetimelib_update_ts(), then apply them viasse +=afterward. Full seconds areextracted from any microsecond overflow before the SSE step.
timelib_update_ts()still handles y/m/d, weekdays, and special relatives, so calendar strings like'+3 days'and'first day of next month'are unaffected.Fixes GH-21616.
Fixes GH-15880.