#17725 change way to checking availability to replace static with self in final classes

Author: rekmixa

Zend/tests/type_declarations/override_another_type_in_final_class_with_union_type_2.phpt

@@ -17,4 +17,4 @@ $b = new B();
 var_dump($b->methodScalar1());
 ?>
 --EXPECTF--
-Fatal error: Declaration of B::methodScalar1(): array must be compatible with A::methodScalar1(): static|bool in %s on line %d
+Fatal error: Declaration of B::methodScalar1(): B|array must be compatible with A::methodScalar1(): static|bool in %s on line %d

Zend/zend_inheritance.c

@@ -570,6 +570,11 @@ static inheritance_status zend_is_class_subtype_of_type(
 	if (have_unresolved) {
 		return INHERITANCE_UNRESOLVED;
 	}
+
+	if (!is_intersection && fe_scope->ce_flags & ZEND_ACC_FINAL && instanceof_function(fe_scope, proto_scope)) {
+		return INHERITANCE_SUCCESS;
+	}
+
 	return is_intersection ? INHERITANCE_SUCCESS : INHERITANCE_ERROR;
 }
 
@@ -678,13 +683,6 @@ ZEND_API inheritance_status zend_perform_covariant_type_check(
 	uint32_t proto_type_mask = ZEND_TYPE_PURE_MASK(proto_type);
 	uint32_t added_types = fe_type_mask & ~proto_type_mask;
 
-	if (proto_type_mask & MAY_BE_STATIC && fe_type_mask | MAY_BE_STATIC &&
-		fe_scope->ce_flags & ZEND_ACC_FINAL &&
-		instanceof_function(fe_scope, proto_scope)) {
-		/* Replacing type that accepts static with self in final classes is okay */
-		return INHERITANCE_SUCCESS;
-	}
-
 	if (added_types) {
 		if ((added_types & MAY_BE_STATIC)
 				&& zend_type_permits_self(proto_type, proto_scope, fe_scope)) {