Do not set the inherited flag only for non-abstract constructors in zend_add_trait_method()

Author: TimWolla

Zend/tests/attributes/override/gh12189_4.phpt

@@ -0,0 +1,24 @@
+--TEST--
+#[Override] attribute in trait does not check for parent class implementations (Variant with __construct)
+--FILE--
+<?php
+
+class A {
+    public function __construct() {}
+}
+
+trait T {
+    #[\Override]
+    public function __construct() {
+        echo 'foo';
+    }
+}
+
+class D extends A {
+    use T;
+}
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: D::__construct() has #[\Override] attribute, but no matching parent method exists in %s on line %d

Zend/tests/attributes/override/gh12189_5.phpt

@@ -0,0 +1,24 @@
+--TEST--
+#[Override] attribute in trait does not check for parent class implementations (Variant with abstract __construct)
+--FILE--
+<?php
+
+abstract class A {
+    abstract public function __construct();
+}
+
+trait T {
+    #[\Override]
+    public function __construct() {
+        echo 'foo';
+    }
+}
+
+class D extends A {
+    use T;
+}
+echo "Done";
+
+?>
+--EXPECT--
+Done

Zend/zend_inheritance.c

@@ -1987,7 +1987,8 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
 				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);
+			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));
 		}
 	}