Make it possible to reinitialize readonly properties after a type error

Author: kocsismate

Zend/tests/readonly_props/readonly_clone_success4.phpt

@@ -4,7 +4,9 @@ Readonly property can be reset once during cloning even after a type error
 <?php
 
 class Foo {
-    public readonly int $bar;
+    public function __construct(
+        public readonly int $bar
+    ) {}
 
     public function __clone()
     {
@@ -18,7 +20,7 @@ class Foo {
     }
 }
 
-$foo = new Foo();
+$foo = new Foo(1);
 
 var_dump(clone $foo);
 var_dump(clone $foo);

Zend/zend_execute.c

@@ -1009,23 +1009,24 @@ static zend_never_inline zval* zend_assign_to_typed_prop(zend_property_info *inf
 {
 	zval tmp;
 
+	ZVAL_DEREF(value);
+	ZVAL_COPY(&tmp, value);
+
+	if (UNEXPECTED(!i_zend_verify_property_type(info, &tmp, EX_USES_STRICT_TYPES()))) {
+		zval_ptr_dtor(&tmp);
+		return &EG(uninitialized_zval);
+	}
+
 	if (UNEXPECTED(info->flags & ZEND_ACC_READONLY)) {
 		if (Z_PROP_FLAG_P(property_val) & IS_PROP_REINITABLE) {
 			Z_PROP_FLAG_P(property_val) &= ~IS_PROP_REINITABLE;
 		} else {
+			zval_ptr_dtor(&tmp);
 			zend_readonly_property_modification_error(info);
 			return &EG(uninitialized_zval);
 		}
 	}
 
-	ZVAL_DEREF(value);
-	ZVAL_COPY(&tmp, value);
-
-	if (UNEXPECTED(!i_zend_verify_property_type(info, &tmp, EX_USES_STRICT_TYPES()))) {
-		zval_ptr_dtor(&tmp);
-		return &EG(uninitialized_zval);
-	}
-
 	return zend_assign_to_variable(property_val, &tmp, IS_TMP_VAR, EX_USES_STRICT_TYPES());
 }
 

Zend/zend_object_handlers.c

@@ -812,17 +812,6 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 			Z_TRY_ADDREF_P(value);
 
 			if (UNEXPECTED(prop_info)) {
-				if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
-					if (Z_PROP_FLAG_P(variable_ptr) & IS_PROP_REINITABLE) {
-						Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_REINITABLE;
-					} else {
-						Z_TRY_DELREF_P(value);
-						zend_readonly_property_modification_error(prop_info);
-						variable_ptr = &EG(error_zval);
-						goto exit;
-					}
-				}
-
 				ZVAL_COPY_VALUE(&tmp, value);
 				// Increase refcount to prevent object from being released in __toString()
 				GC_ADDREF(zobj);
@@ -839,6 +828,16 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 					variable_ptr = &EG(error_zval);
 					goto exit;
 				}
+				if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
+					if (Z_PROP_FLAG_P(variable_ptr) & IS_PROP_REINITABLE) {
+						Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_REINITABLE;
+					} else {
+						Z_TRY_DELREF_P(value);
+						zend_readonly_property_modification_error(prop_info);
+						variable_ptr = &EG(error_zval);
+						goto exit;
+					}
+				}
 				value = &tmp;
 			}