Skip to content

GH-16317: make __debugInfo() overrides work #16333

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

Closed
wants to merge 1 commit into from
Closed

GH-16317: make __debugInfo() overrides work #16333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion ext/standard/var.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,16 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
}
ZEND_GUARD_OR_GC_PROTECT_RECURSION(guard, DEBUG, zobj);

myht = zend_get_properties_for(struc, ZEND_PROP_PURPOSE_DEBUG);
// GH-16317: for user classes with __debugInfo() always call that
if (ce->type == ZEND_USER_CLASS && ce->__debugInfo != NULL) {
int is_temp;
myht = (std_object_handlers.get_debug_info)(zobj, &is_temp);
Copy link
Member

Choose a reason for hiding this comment

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

get_debug_info is technically an optional handler.

Copy link
Member Author

Choose a reason for hiding this comment

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

Generally it is optional, but can it ever be unset from the global std_object_handlers?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, the default handlers may be removed. I don't know exactly why you would do that, but it is currently marked as optional, and its existence is checked for within zend_std_get_properties_for().

if (myht && !is_temp) {
GC_TRY_ADDREF(myht);
}
} else {
myht = zend_get_properties_for(struc, ZEND_PROP_PURPOSE_DEBUG);
}
class_name = Z_OBJ_HANDLER_P(struc, get_class_name)(Z_OBJ_P(struc));
const char *prefix = php_var_dump_object_prefix(Z_OBJ_P(struc));

Expand Down