Skip to content

ext/reflection: various cleanups and simplifications (2) #22660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielEScherzer wants to merge 11 commits into
base: master
Choose a base branch
from
+632 −784
Open

ext/reflection: various cleanups and simplifications (2) #22660

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6ea723a
Fix inline documentation of `ReflectionParameter::isPassedByReference()`
DanielEScherzer Jul 9, 2026
591514f
`ReflectionParameter::__construct()`: optimize closure checking
DanielEScherzer Jul 9, 2026
f44c8c7
`ReflectionClass::getMethods()`: optimize closure checking
DanielEScherzer Jul 9, 2026
d363409
Reflection: remove unused indentation support from `_parameter_string()`
DanielEScherzer Jul 9, 2026
8bd459e
`ReflectionFunctionAbstract::getDocComment()`: use `zend_function.com…
DanielEScherzer Jul 9, 2026
8d5ba54
Reflection: improve handling of dynamic properties in `_property_stri…
DanielEScherzer Jul 9, 2026
4856fb9
Reflection: start cleaning up variable declarations
DanielEScherzer Jul 9, 2026
c42748d
Reflection: clean up variables for hash iteration
DanielEScherzer Jul 9, 2026
ba403df
Reflection: unhoist more variable declarations
DanielEScherzer Jul 9, 2026
75064bb
Reflection: layout and indentation cleanup
DanielEScherzer Jul 9, 2026
6e5dc76
Reflection: use early returns to reduce indentation
DanielEScherzer Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/reflection/php_reflection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,7 +2539,7 @@ ZEND_METHOD(ReflectionParameter, __construct)
case IS_OBJECT: {
ce = Z_OBJCE_P(reference);

if (instanceof_function(ce, zend_ce_closure)) {
if (ce == zend_ce_closure) {

@Girgias Girgias Jul 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to add a comment just to explain it. As instanceof_function() is always inlined to do this pointer comparison and only call the outlined slow function if not true.

fptr = (zend_function *)zend_get_closure_method_def(Z_OBJ_P(reference));
Z_ADDREF_P(reference);
is_closure = true;
Expand Down Expand Up @@ -2840,7 +2840,7 @@ ZEND_METHOD(ReflectionParameter, allowsNull)
}
/* }}} */

/* {{{ Returns whether this parameters is passed to by reference */
/* {{{ Returns whether this parameter is passed to by reference */
ZEND_METHOD(ReflectionParameter, isPassedByReference)
{
reflection_object *intern;
Expand Down Expand Up @@ -4550,7 +4550,7 @@ ZEND_METHOD(ReflectionClass, getMethods)
_addmethod(mptr, ce, Z_ARRVAL_P(return_value), filter);
} ZEND_HASH_FOREACH_END();

if (instanceof_function(ce, zend_ce_closure)) {
if (ce == zend_ce_closure) {

@Girgias Girgias Jul 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto, probably should be a single commit with all the zend_ce_closure checks rather than multiple.

bool has_obj = Z_TYPE(intern->obj) != IS_UNDEF;
zval obj_tmp;
zend_object *obj;
Expand Down