Move the inheritance check of trait methods after the copying of the op_array

Author: TimWolla

Zend/zend_inheritance.c

@@ -1188,7 +1188,13 @@ static zend_always_inline inheritance_status do_inheritance_check_on_method_ex(
 		perform_delayable_implementation_check(ce, child, child_scope, parent, parent_scope);
 	}
 
-	if (!check_only && child->common.scope == ce) {
+	if (
+		!check_only
+		&& (
+			child->common.scope == ce
+			|| (child->common.fn_flags & ZEND_ACC_TRAIT_CLONE)
+		)
+	) {
 		child->common.fn_flags &= ~ZEND_ACC_OVERRIDE;
 	}
 
@@ -1946,7 +1952,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 = false;
+	bool check_inheritance = false;
 
 	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
@@ -1981,14 +1987,7 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 				ZSTR_VAL(ce->name), ZSTR_VAL(name),
 				ZSTR_VAL(existing_fn->common.scope->name), ZSTR_VAL(existing_fn->common.function_name));
 		} else {
-			/* Inherited members are overridden by members inserted by traits.
-			 * Check whether the trait method fulfills the inheritance requirements. */
-			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 = !(existing_fn->common.fn_flags & ZEND_ACC_PRIVATE)
-				&& !(existing_fn->common.fn_flags & ZEND_ACC_CTOR && !(existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT));
+			check_inheritance = true;
 		}
 	}
 
@@ -2009,8 +2008,12 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 	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) {
-		new_fn->common.fn_flags &= ~ZEND_ACC_OVERRIDE;
+	if (check_inheritance) {
+		/* Inherited members are overridden by members inserted by traits.
+		 * Check whether the trait method fulfills the inheritance requirements. */
+		do_inheritance_check_on_method(
+			fn, fixup_trait_scope(fn, ce), existing_fn, fixup_trait_scope(existing_fn, ce),
+			ce, NULL, /* check_visibility */ 1);
 	}
 }
 /* }}} */