Fix GH-18481: date_sunrise check sun rise with offset if is finite/is… #18484
Conversation
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
nielsdos
approved these changes
May 3, 2025
ext/date/php_date.c
Outdated
| @@ -5346,7 +5346,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s | |||
| if (N > 24 || N < 0) { | |||
| N -= floor(N / 24) * 24; | |||
| } | |||
| if (N > 24 || N < 0) { | |||
| if (N > 24 || N < 0 || !zend_finite(N)) { | |||
There was a problem hiding this comment.
It's also possible to do it like this: if (!(N <= 24 && N >= 0)) {, but yours works too.
There was a problem hiding this comment.
sure I m gonna try your simpler approach.
There was a problem hiding this comment.
I think you copied the condition incorrectly
ext/date/tests/gh18481.phpt
Outdated
| @@ -0,0 +1,21 @@ | |||
| --TEST-- | |||
| GH-18481 date_sunrise with utcOffset as INF | |||
There was a problem hiding this comment.
Suggested change
| GH-18481 date_sunrise with utcOffset as INF | |
| GH-18481 (date_sunrise with utcOffset as INF) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
… nan