Fix #[Override] on traits overriding a parent method without a matching interface

Author: TimWolla

Zend/tests/attributes/override/gh12189.phpt

@@ -0,0 +1,42 @@
+--TEST--
+#[Override] attribute in trait does not check for parent class implementations
+--FILE--
+<?php
+
+class A {
+    public function foo(): void {}
+}
+
+interface I {
+    public function foo(): void;
+}
+
+trait T {
+    #[\Override]
+    public function foo(): void {
+        echo 'foo';
+    }
+}
+
+// Works fine
+class B implements I {
+    use T;
+}
+
+// Works fine ("copied and pasted into the target class")
+class C extends A {
+    #[\Override]
+    public function foo(): void {
+        echo 'foo';
+    }
+}
+
+// Does not work
+class D extends A {
+    use T;
+}
+echo "Done";
+
+?>
+--EXPECT--
+Done

Zend/zend_inheritance.c

@@ -1946,6 +1946,7 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 {
 	zend_function *existing_fn = NULL;
 	zend_function *new_fn;
+	bool inherited = 0;
 
 	if ((existing_fn = zend_hash_find_ptr(&ce->function_table, key)) != NULL) {
 		/* if it is the same function with the same visibility and has not been assigned a class scope yet, regardless
@@ -1985,6 +1986,8 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 			do_inheritance_check_on_method(
 				fn, fixup_trait_scope(fn, ce), existing_fn, fixup_trait_scope(existing_fn, ce),
 				ce, NULL, /* check_visibility */ 1);
+
+			inherited = 1;
 		}
 	}
 
@@ -2004,6 +2007,12 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 	function_add_ref(new_fn);
 	fn = zend_hash_update_ptr(&ce->function_table, key, new_fn);
 	zend_add_magic_method(ce, fn, key);
+
+	if (inherited && new_fn->common.fn_flags & ZEND_ACC_OVERRIDE) {
+		do_inheritance_check_on_method(
+				new_fn, new_fn->common.scope, existing_fn, existing_fn->common.scope,
+				new_fn->common.scope, NULL, /* check_visibility */ 1);
+	}
 }
 /* }}} */