Fix prototype for trait methods

Fixes GH-14009

Author: iluuu1994

Zend/tests/gh14009.phpt

@@ -0,0 +1,41 @@
+--TEST--
+GH-14009: Traits inherit prototype
+--FILE--
+<?php
+
+class P {
+    protected function common() {
+        throw new Exception('Unreachable');
+    }
+}
+
+class A extends P {
+    public function test(P $sibling) {
+        $sibling->common();
+    }
+}
+
+class B extends P {
+    protected function common() {
+        echo __METHOD__, "\n";
+    }
+}
+
+trait T {
+    protected function common() {
+        echo __METHOD__, "\n";
+    }
+}
+
+class C extends P {
+    use T;
+}
+
+$a = new A();
+$a->test(new B());
+$a->test(new C());
+
+?>
+--EXPECT--
+B::common
+T::common

Zend/tests/interface_constructor_prototype_001.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Interfaces don't set prototypes to their parent method
+--FILE--
+<?php
+
+interface A {
+    public function __construct(int $param);
+}
+interface B extends A {
+    public function __construct(int|float $param);
+}
+class Test implements B {
+    public function __construct(int $param) {}
+}
+new Test(42);
+
+?>
+--EXPECTF--
+Fatal error: Declaration of Test::__construct(int $param) must be compatible with B::__construct(int|float $param) in %s on line %d

Zend/tests/interface_constructor_prototype_002.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Interfaces don't set prototypes to their parent method
+--XFAIL--
+X::__constructor()'s prototype is set to B::__construct(). Y::__construct() then
+uses prototype to verify LSP, but misses A::__construct() which has a stricter
+signature.
+--FILE--
+<?php
+
+interface A {
+    public function __construct(int|float $param);
+}
+interface B {
+    public function __construct(int $param);
+}
+class X implements A, B {
+    public function __construct(int|float $param) {}
+}
+class Y extends X {
+    public function __construct(int $param) {}
+}
+new Y(42);
+
+?>
+--EXPECT--
+Fatal error: Declaration of Y::__construct(int $param) must be compatible with A::__construct(int|float $param) in %s on line %d

Zend/zend_inheritance.c

@@ -1146,21 +1146,19 @@ static zend_always_inline inheritance_status do_inheritance_check_on_method_ex(
 		parent = proto;
 	}
 
-	if (!check_only && child->common.prototype != proto && child_zv) {
-		do {
-			if (child->common.scope != ce && child->type == ZEND_USER_FUNCTION) {
-				if (ce->ce_flags & ZEND_ACC_INTERFACE) {
-					/* Few parent interfaces contain the same method */
-					break;
-				} else {
-					/* op_array wasn't duplicated yet */
-					zend_function *new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
-					memcpy(new_function, child, sizeof(zend_op_array));
-					Z_PTR_P(child_zv) = child = new_function;
-				}
-			}
-			child->common.prototype = proto;
-		} while (0);
+	if (!check_only && child->common.prototype != proto
+	 && (child_scope == ce || child_zv)
+	 /* We are not setting the prototype of overridden interface methods because of abstract constructors.
+	  * See Zend/tests/interface_constructor_prototype_001.phpt. */
+	 && !(ce->ce_flags & ZEND_ACC_INTERFACE)) {
+		if (child_scope != ce && child->type == ZEND_USER_FUNCTION) {
+			/* op_array wasn't duplicated yet */
+			ZEND_ASSERT(child_zv);
+			zend_function *new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
+			memcpy(new_function, child, sizeof(zend_op_array));
+			Z_PTR_P(child_zv) = child = new_function;
+		}
+		child->common.prototype = proto;
 	}
 
 	/* Prevent derived classes from restricting access that was available in parent classes (except deriving from non-abstract ctors) */