Skip uninitialized typed properties when serializing objects

Partially reverts 846b647: instead of
throwing, this skips uninitialized typed properties when serializing objects.

This preserves the `unserialize(serialize($obj)) == $obj` identity.

Fixes bug https://bugs.php.net/79447

Author: nicolas-grekas

NEWS

@@ -6,6 +6,7 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #78434 (Generator yields no items after valid() call). (Nikita)
   . Fixed bug #79477 (casting object into array creates references). (Nikita)
+  . Fixed bug #79447 (Serializing uninitialized typed properties with __sleep should not throw). (nicolas-grekas)
 
 - DOM:
   . Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).

ext/standard/tests/serialize/sleep_uninitialized_typed_prop.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Referencing an uninitialized typed property in __sleep() should result in Error
+Referencing an uninitialized typed property in __sleep() should be skipped
 --FILE--
 <?php
 
@@ -18,39 +18,27 @@ class Test {
 }
 
 $t = new Test;
-try {
-    serialize($t);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump(serialize($t));
+var_dump(unserialize(serialize($t)) == $t);
 
 $t->x = 1;
-try {
-    serialize($t);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump(unserialize(serialize($t)) == $t);
 
 $t->y = 2;
-try {
-    serialize($t);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump(unserialize(serialize($t)) == $t);
 
 $t->z = 3;
-try {
-    var_dump(unserialize(serialize($t)));
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump(unserialize(serialize($t)) == $t);
 
+var_dump($t);
 ?>
 --EXPECT--
-Typed property Test::$x must not be accessed before initialization (in __sleep)
-Typed property Test::$y must not be accessed before initialization (in __sleep)
-Typed property Test::$z must not be accessed before initialization (in __sleep)
-object(Test)#3 (3) {
+string(15) "O:4:"Test":0:{}"
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+object(Test)#1 (3) {
   ["x"]=>
   int(1)
   ["y":protected]=>

ext/standard/var.c

@@ -784,9 +784,7 @@ static int php_var_serialize_try_add_sleep_prop(
 		if (Z_TYPE_P(val) == IS_UNDEF) {
 			zend_property_info *info = zend_get_typed_property_info_for_slot(Z_OBJ_P(struc), val);
 			if (info) {
-				zend_throw_error(NULL,
-					"Typed property %s::$%s must not be accessed before initialization (in __sleep)",
-					ZSTR_VAL(Z_OBJCE_P(struc)->name), ZSTR_VAL(error_name));
+				return SUCCESS;
 			}
 			return FAILURE;
 		}
@@ -803,13 +801,12 @@ static int php_var_serialize_try_add_sleep_prop(
 }
 /* }}} */
 
-static int php_var_serialize_get_sleep_props(
+static void php_var_serialize_get_sleep_props(
 		HashTable *ht, zval *struc, HashTable *sleep_retval) /* {{{ */
 {
 	zend_class_entry *ce = Z_OBJCE_P(struc);
 	HashTable *props = zend_get_properties_for(struc, ZEND_PROP_PURPOSE_SERIALIZE);
 	zval *name_val;
-	int retval = SUCCESS;
 
 	zend_hash_init(ht, zend_hash_num_elements(sleep_retval), NULL, ZVAL_PTR_DTOR, 0);
 	/* TODO: Rewrite this by fetching the property info instead of trying out different
@@ -829,12 +826,6 @@ static int php_var_serialize_get_sleep_props(
 			continue;
 		}
 
-		if (EG(exception)) {
-			zend_tmp_string_release(tmp_name);
-			retval = FAILURE;
-			break;
-		}
-
 		priv_name = zend_mangle_property_name(
 			ZSTR_VAL(ce->name), ZSTR_LEN(ce->name),
 			ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS);
@@ -845,12 +836,6 @@ static int php_var_serialize_get_sleep_props(
 		}
 		zend_string_release(priv_name);
 
-		if (EG(exception)) {
-			zend_tmp_string_release(tmp_name);
-			retval = FAILURE;
-			break;
-		}
-
 		prot_name = zend_mangle_property_name(
 			"*", 1, ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS);
 		if (php_var_serialize_try_add_sleep_prop(ht, props, prot_name, name, struc) == SUCCESS) {
@@ -860,20 +845,13 @@ static int php_var_serialize_get_sleep_props(
 		}
 		zend_string_release(prot_name);
 
-		if (EG(exception)) {
-			zend_tmp_string_release(tmp_name);
-			retval = FAILURE;
-			break;
-		}
-
 		php_error_docref(NULL, E_NOTICE,
 			"\"%s\" returned as member variable from __sleep() but does not exist", ZSTR_VAL(name));
 		zend_hash_add(ht, name, &EG(uninitialized_zval));
 		zend_tmp_string_release(tmp_name);
 	} ZEND_HASH_FOREACH_END();
 
 	zend_release_properties(props);
-	return retval;
 }
 /* }}} */
 
@@ -929,11 +907,10 @@ static void php_var_serialize_nested_data(smart_str *buf, zval *struc, HashTable
 static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_ptr, php_serialize_data_t var_hash) /* {{{ */
 {
 	HashTable props;
-	if (php_var_serialize_get_sleep_props(&props, struc, HASH_OF(retval_ptr)) == SUCCESS) {
-		php_var_serialize_class_name(buf, struc);
-		php_var_serialize_nested_data(
-			buf, struc, &props, zend_hash_num_elements(&props), /* incomplete_class */ 0, var_hash);
-	}
+	php_var_serialize_get_sleep_props(&props, struc, HASH_OF(retval_ptr));
+	php_var_serialize_class_name(buf, struc);
+	php_var_serialize_nested_data(
+		buf, struc, &props, zend_hash_num_elements(&props), /* incomplete_class */ 0, var_hash);
 	zend_hash_destroy(&props);
 }
 /* }}} */