ext/standard/var.c: show unset properties

Girgias · Girgias · commit 482b7da4c21e · 2024-06-02T17:40:20.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/opcache/tests/preload_loadable_classes_3.phpt b/ext/opcache/tests/preload_loadable_classes_3.phpt
@@ -18,7 +18,7 @@ class Foo {
 var_dump(new Test);
 ?>
 --EXPECT--
-object(Test)#1 (0) {
+object(Test)#1 (1) {
   ["prop":protected]=>
   uninitialized(Foo)
 }
diff --git a/ext/pdo/tests/pdo_036.phpt b/ext/pdo/tests/pdo_036.phpt
@@ -26,7 +26,7 @@ var_dump($x);
 
 ?>
 --EXPECTF--
-object(PDOStatement)#%d (0) {
+object(PDOStatement)#%d (1) {
   ["queryString"]=>
   uninitialized(string)
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt
@@ -71,10 +71,14 @@ NULL
   - After:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#1 (0) {
+  object(C)#1 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#1 (0) {
+object(C)#1 (1) {
+  ["prop"]=>
+  unset
 }
 
 --> Access prop on instance of MyArrayObject:
@@ -99,8 +103,12 @@ NULL
   - After:
 object(MyArrayObject)#3 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#4 (0) {
+  object(C)#4 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#4 (0) {
+object(C)#4 (1) {
+  ["prop"]=>
+  unset
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt
@@ -71,10 +71,14 @@ NULL
   - After:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#1 (0) {
+  object(C)#1 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#1 (0) {
+object(C)#1 (1) {
+  ["prop"]=>
+  unset
 }
 
 --> Access prop on instance of MyArrayObject with ArrayObject::STD_PROP_LIST:
@@ -99,8 +103,12 @@ NULL
   - After:
 object(MyArrayObject)#3 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#4 (0) {
+  object(C)#4 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#4 (0) {
+object(C)#4 (1) {
+  ["prop"]=>
+  unset
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic4.phpt b/ext/spl/tests/arrayObject___construct_basic4.phpt
@@ -69,10 +69,14 @@ NULL
   - After:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#1 (0) {
+  object(C)#1 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#1 (0) {
+object(C)#1 (1) {
+  ["prop"]=>
+  unset
 }
 
 --> Access prop on instance of MyArrayObject with ArrayObject::ARRAY_AS_PROPS:
@@ -97,8 +101,12 @@ NULL
   - After:
 object(MyArrayObject)#3 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#4 (0) {
+  object(C)#4 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#4 (0) {
+object(C)#4 (1) {
+  ["prop"]=>
+  unset
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic5.phpt b/ext/spl/tests/arrayObject___construct_basic5.phpt
@@ -69,10 +69,14 @@ NULL
   - After:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#1 (0) {
+  object(C)#1 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#1 (0) {
+object(C)#1 (1) {
+  ["prop"]=>
+  unset
 }
 
 --> Access prop on instance of MyArrayObject with ArrayObject::STD_PROP_LIST|ArrayObject::ARRAY_AS_PROPS:
@@ -97,8 +101,12 @@ NULL
   - After:
 object(MyArrayObject)#3 (1) {
   ["storage":"ArrayObject":private]=>
-  object(C)#4 (0) {
+  object(C)#4 (1) {
+    ["prop"]=>
+    unset
   }
 }
-object(C)#4 (0) {
+object(C)#4 (1) {
+  ["prop"]=>
+  unset
 }
diff --git a/ext/spl/tests/arrayObject_magicMethods1.phpt b/ext/spl/tests/arrayObject_magicMethods1.phpt
@@ -171,7 +171,9 @@ object(ArrayObject)#2 (1) {
 
 --> Unset existent, non-existent and dynamic:
   Original wrapped object:
-object(UsesMagic)#1 (3) {
+object(UsesMagic)#1 (4) {
+  ["a"]=>
+  unset
   ["b"]=>
   int(2)
   ["c"]=>
@@ -182,7 +184,9 @@ object(UsesMagic)#1 (3) {
   Wrapping ArrayObject:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(UsesMagic)#1 (3) {
+  object(UsesMagic)#1 (4) {
+    ["a"]=>
+    unset
     ["b"]=>
     int(2)
     ["c"]=>
diff --git a/ext/spl/tests/arrayObject_magicMethods3.phpt b/ext/spl/tests/arrayObject_magicMethods3.phpt
@@ -171,7 +171,9 @@ object(ArrayObject)#2 (1) {
 
 --> Unset existent, non-existent and dynamic:
   Original wrapped object:
-object(UsesMagic)#1 (3) {
+object(UsesMagic)#1 (4) {
+  ["a"]=>
+  unset
   ["b"]=>
   int(2)
   ["c"]=>
@@ -182,7 +184,9 @@ object(UsesMagic)#1 (3) {
   Wrapping ArrayObject:
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
-  object(UsesMagic)#1 (3) {
+  object(UsesMagic)#1 (4) {
+    ["a"]=>
+    unset
     ["b"]=>
     int(2)
     ["c"]=>
diff --git a/ext/spl/tests/arrayObject_magicMethods4.phpt b/ext/spl/tests/arrayObject_magicMethods4.phpt
diff --git a/ext/spl/tests/arrayObject_magicMethods6.phpt b/ext/spl/tests/arrayObject_magicMethods6.phpt
diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt
diff --git a/ext/standard/var.c b/ext/standard/var.c
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
diff --git a/tests/lang/foreachLoopObjects.003.phpt b/tests/lang/foreachLoopObjects.003.phpt
diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt
diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt

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`	`}`