Skip to content

[pull] master from php:master#813

Merged
pull[bot] merged 13 commits into
ConnectionMaster:masterfrom
php:master
Jun 14, 2026
Merged

[pull] master from php:master#813
pull[bot] merged 13 commits into
ConnectionMaster:masterfrom
php:master

Conversation

@pull

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

iliaal and others added 13 commits June 14, 2026 10:01
zend_parse_arg_bool_weak and zend_parse_arg_str_weak could return
success with EG(exception) already set, because zend_is_true and
convert_to_string emit the NaN coercion warning without checking
whether the user error handler threw. Recv-arg verification for a
userland function then took the no-check ZEND_VM_NEXT_OPCODE branch,
aborting on ZEND_ASSERT(!EG(exception)). Mirror the existing check in
zend_parse_arg_long_weak and propagate failure when the warning leaves
an exception pending.

Fixes GH-22112
Closes GH-22114
* zend_observer: Convert `ZEND_OBSERVER_HANDLE()` to inline function

* zend_observer: Convert `ZEND_OBSERVER_FCALL_(BEGIN|END)()` to inline functions
…ons (#22297)

`zend_free_trampoline()` requires access to the globals and thus
cannot easily be made an inline function without moving it to a
different (less-appropriate) header. Since trampolines should be
comparatively rare, having an extra function call here should be okay.
* PHP-8.5:
  Fix GH-22112: assertion when error handler throws during NaN coercion
When given a "Class::property" argument, getProperty() lowercased the
class part before looking it up, so the "Class ... does not exist"
exception printed the lowercased name and autoloaders received it in
lowercase, breaking case-sensitive (PSR-4) autoloaders.

Pass the class name to zend_lookup_class() as given - it lowercases
internally for the class-table lookup - matching what ReflectionMethod
and ReflectionProperty already do.
* PHP-8.4:
  Preserve class-name case in ReflectionClass::getProperty() (#22272)
* PHP-8.5:
  Update NEWS after upmerge
  Preserve class-name case in ReflectionClass::getProperty() (#22272)
* PHP-8.5:
  [8.5] NEWS: order extensions alphabetically
This introduces various IO polling backend including epoll, kqueue,
event ports, poll and WSAPoll. It makes the usage compatible between
backends.
It makes use of internal polling API and exposes its functionality to
user space.

Closes GH-19572
@pull pull Bot locked and limited conversation to collaborators Jun 14, 2026
@pull pull Bot added the ⤵️ pull label Jun 14, 2026
@pull pull Bot merged commit 59df418 into ConnectionMaster:master Jun 14, 2026
1 check 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.

6 participants