Skip to content

[pull] master from php:master#951

Merged
pull[bot] merged 9 commits into
turkdevops:masterfrom
php:master
May 24, 2026
Merged

[pull] master from php:master#951
pull[bot] merged 9 commits into
turkdevops:masterfrom
php:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 24, 2026

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 : )

DanielEScherzer and others added 9 commits May 24, 2026 09:39
Remove unneeded parentheses, adjust spacing, should be a no-op
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.
@pull pull Bot locked and limited conversation to collaborators May 24, 2026
@pull pull Bot added the ⤵️ pull label May 24, 2026
@pull pull Bot merged commit 973d511 into turkdevops:master May 24, 2026
1 of 4 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants