Merge release 3.5.1 into 3.6.x #76
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…or access log request representations AccessLogFormatter calls on AccesLogDataMap to format a number of strings, including request times; these are generally used in cookies and/or header values. Previously, we used `strftime()` to format date/time values. However, this is deprecated starting in PHP 8.1, with the recommendation of using `IntlDateFormatter` for purposes of formatting date/time strings in a locale-specific way. Because I'm unclear on whether the formats will always come from internal classes, or if they might come from external sources (e.g., cookie values), I've created a new final class, `Mezzio\Swoole\StrftimeToICUFormatMap` for mapping strftime formats to the ICU equivalents. I've added some basic tests for the class, which include demonstrating that the formats we use internally all get translated correctly. I've also added a test case for `AccessLogDataMap::getRequestTime()` to demonstrate that it generates the same values. Targeting the 3.5 series, as this is technically a bug in our PHP 8.1 support. Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
Since an ICU format can contain additional characters, we can wrap the returned format in the `[]` characters via concatenation instead. Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
…in tests Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
The StrftimeToICUFormatMap case for `%s` was calling `return time()`, which (a) was the incorrect type (a string should be returned), and (b) could lead to a mismatch between the request time and what is reported in the logs. StrftimeToICUFormatMap::mapStrftimeToICU now accepts a second argument, a DateTimeInterface $requestTime, and this is used when `%s` is in the format. AccessLogDataMap::getRequestTime creates a DateTimeImmutable instance from the server $request_time_float property and passes that value to StrftimeToICUFormatMap. Creation of the callback for preg_replace_callback has been moved to another method, based on issues reported by Psalm; the callback now has full typehinting as well. Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
Fix deprecation in request time formatting for access logs
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.
Release Notes for 3.5.1
3.5.x bugfix release (patch)
3.5.1
Bug