[pull] master from php:master#328
Merged
Merged
Conversation
Depending on the specific PHP configuration, the regex matching for the version number in get_zlib_version() can fail. On master, this results in deprecation warnings and subsequent test borks: ``` Deprecated: version_compare(): Passing null to parameter #1 ($version1) of type string is deprecated in /work/php-src/ext/zlib/tests/gzgetc_basic.skip.php on line 3 [/work/php-src/ext/zlib/tests/gzgetc_basic.phpt] Deprecated: version_compare(): Passing null to parameter #1 ($version1) of type string is deprecated in /work/php-src/ext/zlib/tests/gzgetc_basic_1.skip.php on line 4 ``` Since ZLIB_VERSION is a constant containing the version as a string, remove all this nonsense and just use the constant directly.
* PHP-8.4: zlib: fix test skipif sections (#22099)
* PHP-8.5: zlib: fix test skipif sections (#22099)
undefined behavior occurs during cast from float to int when the element of the filter matrix is -INF. Port the libgd clamp helper which treats non-finite accumulators as 0 (negative/NaN) or 255 (positive infinity) instead of bailing out, matching upstream libgd 81d7f2e. close GH-22129
* PHP-8.4: Fix GH-19666: imageconvolution() unexpected nan filter value.
* PHP-8.5: Fix GH-19666: imageconvolution() unexpected nan filter value.
* PHP-8.5: ext/intl: fix deprecation warning for GH-19666 test.
Port the upstream libgd portable fix (overflowMul3) for the int64 overflow at r = a * bq when w/h reach near INT_MAX. Mirrors the upstream libgd commit 0057de6. close GH-22116
* PHP-8.4: Fix GH-19739: imageellipse/imagefilledellipse overflow.
* PHP-8.5: Fix GH-19739: imageellipse/imagefilledellipse overflow.
It's needed to implement #22075 for https://wiki.php.net/rfc/uri_followup#uri_type_detection. Since the upstream changes to lexbor (lexbor/lexbor#362) haven't been released yet, a patch is added for now.
Closes GH-22133. Co-authored-by: Tim Düsterhus <tim@bastelstu.be>
#22075) RFC: https://wiki.php.net/rfc/uri_followup#uri_type_detection --------- Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )