ext/standard/var.c: show unset properties

Girgias · Girgias · commit 01a29c32a97e · 2024-06-02T03:59:23.000+01:00
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
@@ -1237,15 +1237,23 @@ object(Point)#%d (3) {
   ["lable"]=>
   string(6) "Point1"
 }
-object(Point)#%d (2) {
+object(Point)#%d (3) {
+  ["x"]=>
+  unset
   ["y"]=>
   int(40)
   ["lable"]=>
   string(6) "Point1"
 }
 bool(false)
 bool(true)
-object(Point)#%d (0) {
+object(Point)#%d (3) {
+  ["x"]=>
+  unset
+  ["y"]=>
+  unset
+  ["lable"]=>
+  unset
 }
 bool(true)
 bool(false)
diff --git a/Zend/tests/ctor_promotion_untyped_default.phpt b/Zend/tests/ctor_promotion_untyped_default.phpt
@@ -21,7 +21,7 @@ var_dump(new B);
 
 ?>
 --EXPECT--
-object(B)#1 (1) {
+object(B)#1 (2) {
   ["untyped"]=>
   NULL
   ["typed"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_037.phpt b/Zend/tests/type_declarations/typed_properties_037.phpt
@@ -9,7 +9,7 @@ $foo = new class {
 var_dump($foo);
 ?>
 --EXPECTF--
-object(class@anonymous)#%d (1) {
+object(class@anonymous)#%d (2) {
   ["bar"]=>
   int(10)
   ["qux"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_052.phpt b/Zend/tests/type_declarations/typed_properties_052.phpt
@@ -18,7 +18,7 @@ $obj = new A;
 var_dump($obj);
 ?>
 --EXPECT--
-object(A)#1 (0) {
+object(A)#1 (6) {
   ["a1"]=>
   uninitialized(A)
   ["b1"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_059.phpt b/Zend/tests/type_declarations/typed_properties_059.phpt
@@ -17,7 +17,7 @@ $x = new A;
 var_dump($x);
 ?>
 --EXPECT--
-object(A)#1 (0) {
+object(A)#1 (4) {
   ["a2"]=>
   uninitialized(int)
   ["b2"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_072.phpt b/Zend/tests/type_declarations/typed_properties_072.phpt
@@ -18,7 +18,7 @@ var_dump($test->val);
 
 ?>
 --EXPECT--
-object(Test)#1 (0) {
+object(Test)#1 (1) {
   ["val"]=>
   uninitialized(int)
 }
diff --git a/Zend/tests/type_declarations/typed_properties_073.phpt b/Zend/tests/type_declarations/typed_properties_073.phpt
@@ -23,20 +23,20 @@ var_dump($test, $val);
 
 ?>
 --EXPECT--
-object(Test)#1 (1) {
+object(Test)#1 (2) {
   ["prop"]=>
   string(2) "42"
   ["val"]=>
   uninitialized(int)
 }
 int(42)
-object(Test)#1 (1) {
+object(Test)#1 (2) {
   ["prop"]=>
   &int(42)
   ["val"]=>
   uninitialized(int)
 }
-object(Test)#1 (1) {
+object(Test)#1 (2) {
   ["prop"]=>
   &string(1) "x"
   ["val"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_074.phpt b/Zend/tests/type_declarations/typed_properties_074.phpt
@@ -26,14 +26,14 @@ var_dump($test->prop);
 
 ?>
 --EXPECT--
-object(Test)#1 (1) {
+object(Test)#1 (2) {
   ["prop"]=>
   &string(1) "x"
   ["val"]=>
   uninitialized(int)
 }
 Value of type string returned from Test::__get() must be compatible with unset property Test::$val of type int
-object(Test)#1 (1) {
+object(Test)#1 (2) {
   ["prop"]=>
   &string(1) "x"
   ["val"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_086.phpt b/Zend/tests/type_declarations/typed_properties_086.phpt
@@ -20,7 +20,7 @@ var_dump($t);
 
 ?>
 --EXPECT--
-object(T)#1 (1) {
+object(T)#1 (2) {
   ["i"]=>
   uninitialized(int)
   ["1"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_093.phpt b/Zend/tests/type_declarations/typed_properties_093.phpt
@@ -25,7 +25,7 @@ var_dump($test);
 ?>
 --EXPECT--
 Cannot assign string to property Test::$prop of type int
-object(Test)#2 (0) {
+object(Test)#2 (1) {
   ["prop"]=>
   uninitialized(int)
 }
diff --git a/Zend/tests/type_declarations/typed_properties_095.phpt b/Zend/tests/type_declarations/typed_properties_095.phpt
@@ -63,7 +63,7 @@ var_dump(_ZendTestClass::$staticIntProp);
 int(123)
 Cannot assign string to property _ZendTestClass::$intProp of type int
 Cannot assign _ZendTestClass to property _ZendTestClass::$classProp of type ?stdClass
-object(_ZendTestClass)#1 (3) {
+object(_ZendTestClass)#1 (6) {
   ["intProp"]=>
   int(456)
   ["classProp"]=>
@@ -81,7 +81,7 @@ object(_ZendTestClass)#1 (3) {
 int(123)
 Cannot assign string to property _ZendTestClass::$intProp of type int
 Cannot assign Test to property _ZendTestClass::$classProp of type ?stdClass
-object(Test)#4 (3) {
+object(Test)#4 (6) {
   ["intProp"]=>
   int(456)
   ["classProp"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_096.phpt b/Zend/tests/type_declarations/typed_properties_096.phpt
@@ -32,7 +32,7 @@ var_dump($test);
 ?>
 --EXPECT--
 Cannot assign int to property Test1::$prop of type Foobar
-object(Test1)#1 (1) {
+object(Test1)#1 (2) {
   ["prop"]=>
   uninitialized(Foobar)
   ["prop2"]=>
diff --git a/Zend/tests/type_declarations/typed_properties_101.phpt b/Zend/tests/type_declarations/typed_properties_101.phpt
@@ -19,15 +19,15 @@ $test->dump();
 
 ?>
 --EXPECTF--
-object(Test)#1 (0) {
+object(Test)#1 (3) {
   ["public"]=>
   uninitialized(bool)
   ["protected":protected]=>
   uninitialized(float)
   ["private":"Test":private]=>
   uninitialized(string)
 }
-object(Test)#1 (0) refcount(%d){
+object(Test)#1 (3) refcount(%d){
   ["public"]=>
   uninitialized(bool)
   ["protected":protected]=>
diff --git a/Zend/tests/type_declarations/union_types/internal_trait_use_typed_union.phpt b/Zend/tests/type_declarations/union_types/internal_trait_use_typed_union.phpt
@@ -20,7 +20,7 @@ var_dump($types, (string)$types[0], (string)$types[1]);
 ?>
 ===DONE===
 --EXPECT--
-object(C)#1 (1) {
+object(C)#1 (2) {
   ["testProp"]=>
   NULL
   ["classUnionProp"]=>
diff --git a/Zend/tests/unset_prop_recursion.phpt b/Zend/tests/unset_prop_recursion.phpt
@@ -48,6 +48,8 @@ object(Node)#2 (2) {
   object(Node)#1 (2) {
     ["parent"]=>
     NULL
+    ["children"]=>
+    unset
   }
   ["children"]=>
   array(0) {
@@ -58,6 +60,8 @@ object(Node)#3 (2) {
   object(Node)#1 (2) {
     ["parent"]=>
     NULL
+    ["children"]=>
+    unset
   }
   ["children"]=>
   array(0) {
diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
@@ -64,7 +64,7 @@ Class [ <internal%s> class Directory ] {
   }
 }
 Cannot instantiate a valid Directory directly:
-object(Directory)#%d (0) {
+object(Directory)#%d (2) {
   ["path"]=>
   uninitialized(string)
   ["handle"]=>
diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt
@@ -28,7 +28,9 @@ var_dump($data);
 --EXPECT--
 array(2) {
   [0]=>
-  object(evilClass)#1 (0) {
+  object(evilClass)#1 (1) {
+    ["name"]=>
+    unset
   }
   [1]=>
   int(1)
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -75,11 +75,13 @@ static void php_object_property_dump(zend_property_info *prop_info, zval *zv, ze
 	}
 
 	if (Z_TYPE_P(zv) == IS_UNDEF) {
-		ZEND_ASSERT(ZEND_TYPE_IS_SET(prop_info->type));
-		zend_string *type_str = zend_type_to_string(prop_info->type);
-		php_printf("%*cuninitialized(%s)\n",
-			level + 1, ' ', ZSTR_VAL(type_str));
-		zend_string_release(type_str);
+		if (prop_info && ZEND_TYPE_IS_SET(prop_info->type)) {
+			zend_string *type_str = zend_type_to_string(prop_info->type);
+			php_printf("%*cuninitialized(%s)\n", level + 1, ' ', ZSTR_VAL(type_str));
+			zend_string_release(type_str);
+		} else {
+			php_printf("%*cunset\n", level + 1, ' ');
+		}
 	} else {
 		php_var_dump(zv, level + 2);
 	}
@@ -168,7 +170,7 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 			}
 
 			class_name = Z_OBJ_HANDLER_P(struc, get_class_name)(Z_OBJ_P(struc));
-			php_printf("%sobject(%s)#%d (%d) {\n", COMMON, ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), zend_array_count(myht));
+			php_printf("%sobject(%s)#%d (%d) {\n", COMMON, ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), zend_hash_num_elements(myht));
 			zend_string_release_ex(class_name, 0);
 
 			zend_ulong num;
@@ -185,9 +187,7 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 					}
 				}
 
-				if (!Z_ISUNDEF_P(val) || prop_info) {
-					php_object_property_dump(prop_info, val, num, key, level);
-				}
+				php_object_property_dump(prop_info, val, num, key, level);
 			} ZEND_HASH_FOREACH_END();
 			zend_release_properties(myht);
 
@@ -368,7 +368,7 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level) /* {{{ */
 		}
 
 		class_name = Z_OBJ_HANDLER_P(struc, get_class_name)(Z_OBJ_P(struc));
-		php_printf("object(%s)#%d (%d) refcount(%u){\n", ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), zend_array_count(myht), Z_REFCOUNT_P(struc));
+		php_printf("object(%s)#%d (%d) refcount(%u){\n", ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), zend_hash_num_elements(myht), Z_REFCOUNT_P(struc));
 		zend_string_release_ex(class_name, 0);
 
 		ZEND_HASH_FOREACH_KEY_VAL(myht, index, key, val) {
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
@@ -47,7 +47,11 @@ var_dump($c);
 echo "\nUnset a private property, and attempt to recreate at global scope (expecting failure):\n";
 $c = new C;
 $c->unsetPrivate();
-$c->p = 'this will fail';
+try {
+    $c->p = 'this will fail';
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 var_dump($c);
 ?>
 ===DONE===
@@ -59,13 +63,17 @@ object(D)#%d (1) {
 }
 
 Unset superclass's private property, and recreate it as public in subclass:
-object(D)#%d (1) {
+object(D)#%d (2) {
+  ["p":"C":private]=>
+  unset
   ["p"]=>
   string(12) "changed in D"
 }
 
 Unset superclass's private property, and recreate it as public at global scope:
-object(D)#%d (1) {
+object(D)#%d (2) {
+  ["p":"C":private]=>
+  unset
   ["p"]=>
   string(34) "this will create a public property"
 }
@@ -78,8 +86,9 @@ object(C)#%d (1) {
 }
 
 Unset a private property, and attempt to recreate at global scope (expecting failure):
-
-Fatal error: Uncaught Error: Cannot access private property C::$p in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Error: Cannot access private property C::$p
+object(C)#%d (1) {
+  ["p":"C":private]=>
+  unset
+}
+===DONE===
diff --git a/tests/lang/foreachLoopObjects.003.phpt b/tests/lang/foreachLoopObjects.003.phpt
@@ -232,7 +232,13 @@ object(C)#%d (17) {
 
 Removing properties from an object.
 string(10) "Original a"
-object(C)#%d (2) {
+object(C)#%d (5) {
+  ["a"]=>
+  unset
+  ["b"]=>
+  unset
+  ["c"]=>
+  unset
   ["d":protected]=>
   string(10) "Original d"
   ["e":"C":private]=>
@@ -241,7 +247,13 @@ object(C)#%d (2) {
 
 Removing properties from an object, using &$value.
 string(10) "Original a"
-object(C)#%d (2) {
+object(C)#%d (5) {
+  ["a"]=>
+  unset
+  ["b"]=>
+  unset
+  ["c"]=>
+  unset
   ["d":protected]=>
   string(10) "Original d"
   ["e":"C":private]=>
diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt
@@ -41,9 +41,11 @@ string(10) "Original d"
 
 Warning: Undefined property: C::$b in %s on line %d
 string(10) "Original e"
-object(C)#%d (4) {
+object(C)#%d (5) {
   ["a"]=>
   string(10) "Original a"
+  ["b"]=>
+  unset
   ["c"]=>
   string(10) "Original c"
   ["d"]=>
diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt
@@ -48,11 +48,13 @@ string(10) "Original a"
 string(10) "Original b"
 string(10) "Original d"
 string(10) "Original e"
-object(C)#%d (4) {
+object(C)#%d (5) {
   ["a"]=>
   string(10) "Original a"
   ["b"]=>
   string(10) "Original b"
+  ["c"]=>
+  unset
   ["d"]=>
   string(10) "Original d"
   ["e"]=>
@@ -65,7 +67,9 @@ string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
 string(10) "Original e"
-object(C)#%d (4) {
+object(C)#%d (5) {
+  ["a"]=>
+  unset
   ["b"]=>
   string(10) "Original b"
   ["c"]=>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var_dump($test->val);`
`18`	`18`
`19`	`19`	`?>`
`20`	`20`	`--EXPECT--`
`21`		`-object(Test)#1 (0) {`
	`21`	`+object(Test)#1 (1) {`
`22`	`22`	`["val"]=>`
`23`	`23`	`uninitialized(int)`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ var_dump($test);`
`25`	`25`	`?>`
`26`	`26`	`--EXPECT--`
`27`	`27`	`Cannot assign string to property Test::$prop of type int`
`28`		`-object(Test)#2 (0) {`
	`28`	`+object(Test)#2 (1) {`
`29`	`29`	`["prop"]=>`
`30`	`30`	`uninitialized(int)`
`31`	`31`	`}`