[RateLimiter] handle error results of DateTime::modify() #58791
Merged
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
xabbuh
commented
Nov 7, 2024
|
|
||
| return $now->diff($now->modify('+'.$interval)); |
There was a problem hiding this comment.
modify() returns false on failure, thus we must not pass it to diff() before checking the type
xabbuh
commented
Nov 7, 2024
| throw $e; | ||
| } | ||
| try { | ||
| $nowPlusInterval = @$now->modify('+' . $interval); |
There was a problem hiding this comment.
up to PHP 8.2 the method emitted a warning on invalid intervals which we need to silence here
xabbuh
commented
Nov 7, 2024
| } | ||
| try { | ||
| $nowPlusInterval = @$now->modify('+' . $interval); | ||
| } catch (\DateMalformedStringException $e) { |
There was a problem hiding this comment.
from PHP 8.3 on a DateMalformedStringException is thrown instead
7236182 to
d526677
Compare
derrabus
approved these changes
Nov 7, 2024
Depending on the version of PHP the modify() method will either throw an exception or issue a warning.
alexandre-daubois
approved these changes
Nov 7, 2024
|
The other calls of |
This was referenced Nov 13, 2024
Merged
Merged
Merged
Merged
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.
Depending on the version of PHP the
modify()method will either throw an exception or issue a warning.