Allow reassign within nested calls

Author: nicolas-grekas

…ly_props/cpp_reassign_indirect_fail.phpt …props/cpp_reassign_indirect_allowed.phptZend/tests/readonly_props/cpp_reassign_indirect_fail.phpt renamed to Zend/tests/readonly_props/cpp_reassign_indirect_allowed.phpt Zend/tests/readonly_props/cpp_reassign_indirect_fail.phpt renamed to Zend/tests/readonly_props/cpp_reassign_indirect_allowed.phpt

@@ -1,18 +1,14 @@
 --TEST--
-Promoted readonly property reassignment in constructor - indirect reassignment not allowed
+Promoted readonly property reassignment in constructor - indirect reassignment allowed
 --FILE--
 <?php
 
-// Reassignment is NOT allowed in methods called by the constructor
+// Reassignment IS allowed in methods called by the constructor
 class CalledMethod {
     public function __construct(
         public readonly string $prop = 'default',
     ) {
-        try {
-            $this->initProp();
-        } catch (Error $e) {
-            echo $e->getMessage(), "\n";
-        }
+        $this->initProp();
     }
 
     private function initProp(): void {
@@ -23,28 +19,45 @@ class CalledMethod {
 $cm = new CalledMethod();
 var_dump($cm->prop);
 
-// Reassignment is NOT allowed in closures called by the constructor
+// Reassignment IS allowed in closures called by the constructor
 class ClosureInConstructor {
     public function __construct(
         public readonly string $prop = 'default',
     ) {
         $fn = function() {
             $this->prop = 'from closure';
         };
+        $fn();
+    }
+}
+
+$cc = new ClosureInConstructor();
+var_dump($cc->prop);
+
+// But second reassignment still fails
+class MultipleReassign {
+    public function __construct(
+        public readonly string $prop = 'default',
+    ) {
+        $this->initProp();
         try {
-            $fn();
+            $this->initProp();  // Second call - should fail
         } catch (Error $e) {
             echo $e->getMessage(), "\n";
         }
     }
+
+    private function initProp(): void {
+        $this->prop = 'from method';
+    }
 }
 
-$cc = new ClosureInConstructor();
-var_dump($cc->prop);
+$mr = new MultipleReassign();
+var_dump($mr->prop);
 
 ?>
 --EXPECT--
-Cannot modify readonly property CalledMethod::$prop
-string(7) "default"
-Cannot modify readonly property ClosureInConstructor::$prop
-string(7) "default"
+string(11) "from method"
+string(12) "from closure"
+Cannot modify readonly property MultipleReassign::$prop
+string(11) "from method"

Zend/zend_object_handlers.c

@@ -46,16 +46,23 @@
 #define IN_ISSET	ZEND_GUARD_PROPERTY_ISSET
 #define IN_HOOK		ZEND_GUARD_PROPERTY_HOOK
 
-/* Check if we're in the constructor of the class that declared the property.
- * Ensures that a child class cannot reassign a parent's promoted readonly property. */
+/* Check if we're within a constructor call chain for the class that declared the property.
+ * Walks up the call stack to find if any frame is a constructor for zobj with the right scope.
+ * This allows reassignment from methods/closures called by the constructor. */
 ZEND_API bool zend_is_in_property_declaring_class_constructor(const zend_property_info *prop_info, const zend_object *zobj)
 {
 	zend_execute_data *ex = EG(current_execute_data);
-	return ex && ex->func
-		&& (ex->func->common.fn_flags & ZEND_ACC_CTOR)
-		&& (ZEND_CALL_INFO(ex) & ZEND_CALL_HAS_THIS)
-		&& Z_OBJ(ex->This) == zobj
-		&& ex->func->common.scope == prop_info->ce;
+	while (ex) {
+		if (ex->func
+		    && (ex->func->common.fn_flags & ZEND_ACC_CTOR)
+		    && (ZEND_CALL_INFO(ex) & ZEND_CALL_HAS_THIS)
+		    && Z_OBJ(ex->This) == zobj
+		    && ex->func->common.scope == prop_info->ce) {
+			return true;
+		}
+		ex = ex->prev_execute_data;
+	}
+	return false;
 }
 
 static zend_arg_info zend_call_trampoline_arginfo[1] = {{0}};