Adjust after review

Author: bwoebi

Zend/tests/asymmetric_visibility/gh19044.phpt

@@ -0,0 +1,28 @@
+--TEST--
+GH-19044: Protected properties must be scoped according to their prototype (protected(set) on non-hooked property)
+--FILE--
+<?php
+
+class P {
+    public mixed $foo { get => 42; }
+}
+
+class C1 extends P {
+    public protected(set) mixed $foo = 1;
+}
+
+class C2 extends P {
+    public protected(set) mixed $foo;
+
+    static function foo($c) { return $c->foo += 1; }
+}
+
+var_dump(C2::foo(new C1));
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot modify protected(set) property C1::$foo from scope C2 in %s:%d
+Stack trace:
+#0 %s(%d): C2::foo(Object(C1))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/property_hooks/gh19044-6.phpt

@@ -0,0 +1,28 @@
+--TEST--
+GH-19044: Protected properties must be scoped according to their prototype (abstract parent has implicit set hook)
+--FILE--
+<?php
+
+abstract class GP {
+    public abstract mixed $foo { get; }
+}
+
+class P extends GP {
+    public protected(set) mixed $foo { get => $this->foo; }
+}
+
+class C1 extends P {
+    public protected(set) mixed $foo = 1;
+}
+
+class C2 extends P {
+    public protected(set) mixed $foo;
+
+    static function foo($c) { return $c->foo += 1; }
+}
+
+var_dump(C2::foo(new C1));
+
+?>
+--EXPECT--
+int(2)

Zend/zend_object_handlers.c

@@ -286,14 +286,25 @@ static zend_never_inline int is_protected_compatible_scope(const zend_class_entr
 }
 /* }}} */
 
-static zend_never_inline int is_asymmetric_set_protected_property_compatible_scope(const zend_property_info *info, const zend_class_entry *scope) /* {{{ */
+static int is_asymmetric_set_protected_property_compatible_scope(const zend_property_info *info, const zend_class_entry *scope) /* {{{ */
 {
 	zend_class_entry *ce;
-	if (!(info->prototype->flags & ZEND_ACC_PROTECTED_SET) && info->hooks && info->hooks[ZEND_PROPERTY_HOOK_SET]) {
-	       zend_function *hookfn = info->hooks[ZEND_PROPERTY_HOOK_SET];
-	       ce = hookfn->common.prototype ? hookfn->common.prototype->common.scope : hookfn->common.scope;
+	/* we need to identify the common protected(set) ancestor: if the prototype has the protected(set), it's straightforward */
+	if (info->prototype->flags & ZEND_ACC_PROTECTED_SET) {
+		ce = info->prototype->ce;
+	} else if (info->hooks && info->hooks[ZEND_PROPERTY_HOOK_SET]) {
+		/* shortcut: the visibility of hooks cannot be overwritten */
+		zend_function *hook = info->hooks[ZEND_PROPERTY_HOOK_SET];
+		ce = zend_get_function_root_class(hook);
 	} else {
-	       ce = info->prototype->ce;
+		/* we do not have an easy way to find the ancestor which introduces the protected(set), let's iterate */
+		do {
+			ce = info->ce;
+			if (!ce->parent->properties_info_table) {
+				break;
+			}
+			info = ce->parent->properties_info_table[OBJ_PROP_TO_NUM(info->offset)];
+		} while (info->flags & ZEND_ACC_PROTECTED_SET);
 	}
 	return is_protected_compatible_scope(ce, scope);
 }