Skip to content

reflection: pass zend_object* to _class_string() #23279

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
Girgias wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −7
Open

reflection: pass zend_object* to _class_string() #23279

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
13 changes: 6 additions & 7 deletions ext/reflection/php_reflection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,11 @@ static void _function_string(smart_str *str, const zend_function *fptr, const ze
static void _property_string(smart_str *str, const zend_property_info *prop, const zend_string *prop_name, const char *indent);
static void _class_const_string(smart_str *str, const zend_string *name, zend_class_constant *c, const char *indent);
static void _enum_case_string(smart_str *str, const zend_string *name, zend_class_constant *c, const char *indent);
static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const char *indent);
static void _extension_string(smart_str *str, const zend_module_entry *module);
static void _zend_extension_string(smart_str *str, const zend_extension *extension);

/* {{{ _class_string */
static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const char *indent)
static void _class_string(smart_str *str, zend_class_entry *ce, zend_object *obj, const char *indent)
{
/* TBD: Repair indenting of doc comment (or is this to be done in the parser?) */
if (ce->doc_comment) {
Expand All @@ -310,7 +309,7 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const
smart_str_appendc(str, '\n');
}

if (obj && Z_TYPE_P(obj) == IS_OBJECT) {
if (obj) {
smart_str_append_printf(str, "%sObject of class [ ", indent);
} else {
const char *kind = "Class";
Expand Down Expand Up @@ -492,8 +491,8 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const
}
smart_str_append_printf(str, "%s }\n", indent);

if (obj && Z_TYPE_P(obj) == IS_OBJECT) {
HashTable *properties = zend_get_properties_no_lazy_init(Z_OBJ_P(obj));
if (obj) {
HashTable *properties = zend_get_properties_no_lazy_init(obj);
smart_str prop_str = {0};

count = 0;
Expand Down Expand Up @@ -527,7 +526,7 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const
zend_function *closure;
/* see if this is a closure */
if (obj && is_closure_invoke(ce, mptr->common.function_name)
&& (closure = zend_get_closure_invoke_method(Z_OBJ_P(obj))) != NULL)
&& (closure = zend_get_closure_invoke_method(obj)) != NULL)
{
mptr = closure;
} else {
Expand Down Expand Up @@ -4260,7 +4259,7 @@ ZEND_METHOD(ReflectionClass, __toString)

ZEND_PARSE_PARAMETERS_NONE();
GET_REFLECTION_OBJECT_PTR(ce);
_class_string(&str, ce, &intern->obj, "");
_class_string(&str, ce, Z_ISUNDEF(intern->obj) ? NULL : Z_OBJ(intern->obj), "");
RETURN_STR(smart_str_extract(&str));
}
/* }}} */
Expand Down
Loading