Fix dumping of protected/private hooks

The name was mangled, so unfortunately we need an allocation. It would probably
make sense to store the unmangled name in the property_info at this point, since
the name is interned anyway.

Author: iluuu1994

Zend/tests/property_hooks/dump.phpt

@@ -88,8 +88,8 @@ array(3) {
    'addedHooks' => 'addedHooks',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
-   'private' => NULL,
-   'changed' => NULL,
+   'private' => 'PRIVATE',
+   'changed' => 'CHANGED TEST',
 ))
 {"addedHooks":"addedHooks","virtual":"VIRTUAL","backed":"BACKED"}
 array(4) {
@@ -124,10 +124,10 @@ array(3) {
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => NULL,
+   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
-   'private' => NULL,
+   'private' => 'PRIVATE',
    'changed' => 'changed Child',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}
@@ -162,6 +162,8 @@ array(4) {
   string(7) "VIRTUAL"
   ["backed"]=>
   string(6) "BACKED"
+  ["private"]=>
+  string(7) "PRIVATE"
 }
 array(5) {
   ["addedHooks"]=>
@@ -177,10 +179,10 @@ array(5) {
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => NULL,
+   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
-   'private' => NULL,
+   'private' => 'PRIVATE',
    'changed' => 'changed Child',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}
@@ -211,6 +213,8 @@ object(Child)#%d (5) {
 array(5) {
   ["addedHooks"]=>
   string(10) "ADDEDHOOKS"
+  ["changed"]=>
+  string(13) "CHANGED CHILD"
   ["virtual"]=>
   string(7) "VIRTUAL"
   ["backed"]=>
@@ -220,10 +224,10 @@ array(5) {
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => NULL,
+   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
-   'private' => NULL,
+   'private' => 'PRIVATE',
    'changed' => 'changed Child',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}

Zend/zend_builtin_functions.c

@@ -810,7 +810,10 @@ ZEND_FUNCTION(get_object_vars)
 				if ((prop_info->flags & ZEND_ACC_VIRTUAL) && !prop_info->hooks[ZEND_PROPERTY_HOOK_GET]) {
 					continue;
 				}
-				zend_read_property_ex(prop_info->ce, zobj, prop_info->name, /* silent */ true, &tmp);
+				const char *unmangled_name_cstr = zend_get_unmangled_property_name(prop_info->name);
+				zend_string *unmangled_name = zend_string_init(unmangled_name_cstr, strlen(unmangled_name_cstr), false);
+				zend_read_property_ex(prop_info->ce, zobj, unmangled_name, /* silent */ true, &tmp);
+				zend_string_release_ex(unmangled_name, false);
 				if (EG(exception)) {
 					zend_release_properties(properties);
 					zval_ptr_dtor(return_value);

ext/json/json_encoder.c

@@ -237,33 +237,12 @@ static zend_result php_json_encode_array(smart_str *buf, zval *val, int options,
 		zend_ulong index;
 
 		ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, data) {
-			if (r == PHP_JSON_OUTPUT_OBJECT
-			 && key
-			 && ZSTR_VAL(key)[0] == '\0'
-			 && ZSTR_LEN(key) > 0
-			 && Z_TYPE_P(val) == IS_OBJECT) {
-				/* Skip protected and private members. */
-				continue;
-			}
-
-			/* data is IS_PTR for properties with hooks. */
 			zval tmp;
 			ZVAL_UNDEF(&tmp);
-			if (UNEXPECTED(Z_TYPE_P(data) == IS_PTR)) {
-				zend_property_info *prop_info = Z_PTR_P(data);
-				if ((prop_info->flags & ZEND_ACC_VIRTUAL) && !prop_info->hooks[ZEND_PROPERTY_HOOK_GET]) {
-					continue;
-				}
-				zend_read_property_ex(prop_info->ce, Z_OBJ_P(val), prop_info->name, /* silent */ true, &tmp);
-				if (EG(exception)) {
-					PHP_JSON_HASH_UNPROTECT_RECURSION(recursion_rc);
-					zend_release_properties(prop_ht);
-					return FAILURE;
-				}
-				data = &tmp;
-			}
 
 			if (r == PHP_JSON_OUTPUT_ARRAY) {
+				ZEND_ASSERT(Z_TYPE_P(data) != IS_PTR);
+
 				if (need_comma) {
 					smart_str_appendc(buf, ',');
 				} else {
@@ -274,6 +253,26 @@ static zend_result php_json_encode_array(smart_str *buf, zval *val, int options,
 				php_json_pretty_print_indent(buf, options, encoder);
 			} else if (r == PHP_JSON_OUTPUT_OBJECT) {
 				if (key) {
+					if (ZSTR_VAL(key)[0] == '\0' && ZSTR_LEN(key) > 0 && Z_TYPE_P(val) == IS_OBJECT) {
+						/* Skip protected and private members. */
+						continue;
+					}
+
+					/* data is IS_PTR for properties with hooks. */
+					if (UNEXPECTED(Z_TYPE_P(data) == IS_PTR)) {
+						zend_property_info *prop_info = Z_PTR_P(data);
+						if ((prop_info->flags & ZEND_ACC_VIRTUAL) && !prop_info->hooks[ZEND_PROPERTY_HOOK_GET]) {
+							continue;
+						}
+						zend_read_property_ex(prop_info->ce, Z_OBJ_P(val), prop_info->name, /* silent */ true, &tmp);
+						if (EG(exception)) {
+							PHP_JSON_HASH_UNPROTECT_RECURSION(recursion_rc);
+							zend_release_properties(prop_ht);
+							return FAILURE;
+						}
+						data = &tmp;
+					}
+
 					if (need_comma) {
 						smart_str_appendc(buf, ',');
 					} else {

ext/standard/var.c

@@ -617,7 +617,10 @@ PHPAPI zend_result php_var_export_ex(zval *struc, int level, smart_str *buf) /*
 							if ((prop_info->flags & ZEND_ACC_VIRTUAL) && !prop_info->hooks[ZEND_PROPERTY_HOOK_GET]) {
 								continue;
 							}
-							val = zend_read_property_ex(prop_info->ce, zobj, prop_info->name, /* silent */ true, &tmp);
+							const char *unmangled_name_cstr = zend_get_unmangled_property_name(prop_info->name);
+							zend_string *unmangled_name = zend_string_init(unmangled_name_cstr, strlen(unmangled_name_cstr), false);
+							val = zend_read_property_ex(prop_info->ce, zobj, unmangled_name, /* silent */ true, &tmp);
+							zend_string_release_ex(unmangled_name, false);
 							if (EG(exception)) {
 								ZEND_GUARD_OR_GC_UNPROTECT_RECURSION(guard, EXPORT, zobj);
 								zend_release_properties(myht);