#17725 remove redundand checking for is_intersection & move checking for static before checking for final

michael19 · michael19 · commit a957dbf1a16f · 2025-02-19T12:55:39.000+05:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -572,8 +572,8 @@ static inheritance_status zend_is_class_subtype_of_type(
 	}
 
 	/* Replacing static with self in final classes is okay */
-	if (!is_intersection && (fe_scope->ce_flags & ZEND_ACC_FINAL) &&
-		(ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) && unlinked_instanceof(fe_scope, proto_scope)) {
+	if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) &&
+		(fe_scope->ce_flags & ZEND_ACC_FINAL) && unlinked_instanceof(fe_scope, proto_scope)) {
 		if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);
 
 		if (fe_ce == fe_scope) {

Original file line number	Diff line number	Diff line change
`@@ -572,8 +572,8 @@ static inheritance_status zend_is_class_subtype_of_type(`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`/* Replacing static with self in final classes is okay */`
`575`		`- if (!is_intersection && (fe_scope->ce_flags & ZEND_ACC_FINAL) &&`
`576`		`- (ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) && unlinked_instanceof(fe_scope, proto_scope)) {`
	`575`	`+ if ((ZEND_TYPE_FULL_MASK(proto_type) & MAY_BE_STATIC) &&`
	`576`	`+ (fe_scope->ce_flags & ZEND_ACC_FINAL) && unlinked_instanceof(fe_scope, proto_scope)) {`
`577`	`577`	`if (!fe_ce) fe_ce = lookup_class(fe_scope, fe_class_name);`
`578`	`578`
`579`	`579`	`if (fe_ce == fe_scope) {`