Skip to content

[pull] master from php:master#1085

Merged
pull[bot] merged 16 commits into
turkdevops:masterfrom
php:master
Jul 13, 2026
Merged

[pull] master from php:master#1085
pull[bot] merged 16 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jul 13, 2026

Copy link
Copy Markdown

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

orlitzky and others added 16 commits July 13, 2026 05:11
These two are regression tests for the bundled libgd, we have to skip
them if an external libgd is used.

close GH-22711
* PHP-8.4:
  ext/gd/tests/gh19{666,739}.phpt: skip for external libgd
* PHP-8.5:
  ext/gd/tests/gh19{666,739}.phpt: skip for external libgd
* PHP-8.5:
  ext/ldap: fix ldap_explode_dn result ordering
* PHP-8.5:
  zend_objects: Readonly properties must be re-locked after clone-with (#22654)
This reverts the FileInputHelperTest skip added in 1182b14.
* PHP-8.4:
  CI: Revert timeout fix for Symfony community build (#22682)
* PHP-8.5:
  CI: Revert timeout fix for Symfony community build (#22682)
Instead of tracking columns during lexing, which costs performance for
something that will only be required in the unexpected failure path, we now
only track the line numbers and calculate the column on demand when an error
occurs.

As part of this we also fix GH-22487 by adjusting the logic to report the
column based on the (UTF-8) column in the source, instead of treating
`\uXXXX` escapes as a single column, which users will need to count manually
instead of being able to rely on their editor or `mb_substr()` or similar.

[tim: (re)written the commit message]

Co-authored-by: Tim Düsterhus <tim@bastelstu.be>
If we do not install GNU libiconv, the musl libc iconv()
implementation should take over, allowing it to be tested
on the CI.

Closes GH-22645
* PHP-8.4:
  Alpine CI: don't install gnu-libiconv-dev
* PHP-8.5:
  Alpine CI: don't install gnu-libiconv-dev
@pull pull Bot locked and limited conversation to collaborators Jul 13, 2026
@pull pull Bot added the ⤵️ pull label Jul 13, 2026
@pull pull Bot merged commit 7cc47ff into turkdevops:master Jul 13, 2026
1 check was pending
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.

10 participants