Better handling of magic get/set

Author: nikic

Zend/tests/readonly_props/magic_get_set.phpt

@@ -0,0 +1,74 @@
+--TEST--
+Interaction with magic get/set
+--FILE--
+<?php
+
+class Test {
+    public readonly int $prop;
+
+    public function unsetProp() {
+        unset($this->prop);
+    }
+
+    public function __get($name) {
+        echo __METHOD__, "($name)\n";
+        return 1;
+    }
+
+    public function __set($name, $value) {
+        echo __METHOD__, "($name, $value)\n";
+    }
+
+    public function __unset($name) {
+        echo __METHOD__, "($name)\n";
+    }
+
+    public function __isset($name) {
+        echo __METHOD__, "($name)\n";
+        return true;
+    }
+}
+
+$test = new Test;
+
+// The property is in uninitialized state, no magic methods should be invoked.
+var_dump(isset($test->prop));
+try {
+    var_dump($test->prop);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    $test->prop = 1;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    unset($test->prop);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$test->unsetProp();
+
+var_dump(isset($test->prop));
+var_dump($test->prop);
+$test->prop = 2;
+try {
+    unset($test->prop);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+bool(false)
+Typed property Test::$prop must not be accessed before initialization
+Cannot initialize readonly property Test::$prop from global scope
+Cannot unset readonly property Test::$prop from global scope
+Test::__isset(prop)
+bool(true)
+Test::__get(prop)
+int(1)
+Test::__set(prop, 2)
+Test::__unset(prop)

Zend/zend_object_handlers.c

@@ -800,11 +800,6 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 				variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());
 			goto exit;
 		}
-		if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY)
-				&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "initialize"))) {
-			variable_ptr = &EG(error_zval);
-			goto exit;
-		}
 		if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {
 			/* Writes to uninitialized typed properties bypass __set(). */
 			goto write_std_property;
@@ -855,6 +850,13 @@ 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)
+						&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "initialize"))) {
+					Z_TRY_DELREF_P(value);
+					variable_ptr = &EG(error_zval);
+					goto exit;
+				}
+
 				ZVAL_COPY_VALUE(&tmp, value);
 				if (UNEXPECTED(!zend_verify_property_type(prop_info, &tmp, property_uses_strict_types()))) {
 					zval_ptr_dtor(value);
@@ -1093,11 +1095,12 @@ ZEND_API void zend_std_unset_property(zend_object *zobj, zend_string *name, void
 			}
 			return;
 		}
-		if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY)
-				&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "unset"))) {
-			return;
-		}
 		if (UNEXPECTED(Z_PROP_FLAG_P(slot) == IS_PROP_UNINIT)) {
+			if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY)
+					&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "unset"))) {
+				return;
+			}
+
 			/* Reset the IS_PROP_UNINIT flag, if it exists and bypass __unset(). */
 			Z_PROP_FLAG_P(slot) = 0;
 			return;