Skip to content

[pull] master from php:master#843

Merged
pull[bot] merged 9 commits into
dolfly:masterfrom
php:master
Jun 22, 2026
Merged

[pull] master from php:master#843
pull[bot] merged 9 commits into
dolfly:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jun 22, 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 : )

#22374)

Reduced temporary allocations when iterating Phar directories.
Calling Collator::__construct() or Spoofchecker::__construct() on an already
constructed object replaces the stored ICU handle, which leaves the previous
handle unreachable and prevents it from being released during object
destruction.

Reject repeated construction with an Error for both classes so the existing ICU
handle remains owned by the object. Add PHPT coverage for the double
construction path.

Closes #22386
* PHP-8.4:
  ext/intl: Fix double construction leaks (#22386)
* PHP-8.5:
  ext/intl: Fix double construction leaks (#22386)
…2386)

PHP-8.5 no longer declares a zend_error_handling variable in
Spoofchecker::__construct(). The previous merge from PHP-8.4 carried forward a
zend_replace_error_handling() call that references the removed local variable.

Remove the stale call so PHP-8.5 and branches merged from it build again.
* PHP-8.5:
  ext/intl: Fix Spoofchecker build after double construction change (#22386)
…on section

Move the Locale::lookup() and double-construction leak NEWS entries from the
previous release section to the current unreleased section. These fixes landed
after the previous release and should be listed under the next one.
* PHP-8.4:
  [skip ci] Fix NEWS entry for several Intl fixes into the latest version section
* PHP-8.5:
  [skip ci] Fix NEWS entry for several Intl fixes into the latest version section
@pull pull Bot locked and limited conversation to collaborators Jun 22, 2026
@pull pull Bot added the ⤵️ pull label Jun 22, 2026
@pull pull Bot merged commit 8e3b2c5 into dolfly:master Jun 22, 2026
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.

1 participant