#17725 change checking ability to replace static with self & update tests

Author: rekmixa

Zend/tests/type_declarations/variance/override_static_with_self/override_another_type_in_final_class_with_union_type_3.phpt

@@ -8,14 +8,14 @@ interface A
     public function methodScalar1(): static|bool;
 }
 
-final class B implements A
+final class C implements A
 {
-    public function methodScalar1(): C { return new C(); }
+    public function methodScalar1(): self { return $this; }
 }
 
-final class C implements A
+final class B implements A
 {
-    public function methodScalar1(): self { return $this; }
+    public function methodScalar1(): C { return new C(); }
 }
 
 $b = new B();

Zend/tests/type_declarations/variance/override_static_with_self/override_another_type_in_final_class_with_union_type_4.phpt

@@ -8,14 +8,14 @@ interface A
     public function methodScalar1(): static|bool;
 }
 
-final class B implements A
+final class C implements A
 {
-    public function methodScalar1(): C|array { return []; }
+    public function methodScalar1(): self { return $this; }
 }
 
-final class C implements A
+final class B implements A
 {
-    public function methodScalar1(): self { return $this; }
+    public function methodScalar1(): C|array { return []; }
 }
 
 $b = new B();

Zend/tests/type_declarations/variance/override_static_with_self/override_another_type_in_final_class_with_union_type_5.phpt

@@ -8,13 +8,13 @@ interface A
     public function methodScalar1(): static|bool;
 }
 
-final class B implements A
+final class C
 {
-    public function methodScalar1(): C { return new C(); }
 }
 
-final class C
+final class B implements A
 {
+    public function methodScalar1(): C { return new C(); }
 }
 
 $b = new B();

Zend/tests/type_declarations/variance/override_static_with_self/override_another_type_in_final_class_with_union_type_6.phpt

@@ -8,13 +8,13 @@ interface A
     public function methodScalar1(): static|bool;
 }
 
-final class B implements A
+final class C
 {
-    public function methodScalar1(): C|array { return []; }
 }
 
-final class C
+final class B implements A
 {
+    public function methodScalar1(): C|array { return []; }
 }
 
 $b = new B();

Zend/zend_inheritance.c

@@ -502,6 +502,18 @@ static inheritance_status zend_is_class_subtype_of_type(
 		}
 	}
 
+	/* Replacing static with self in final classes is okay */
+	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) {
+			have_unresolved = 1;
+		} else if (fe_ce == fe_scope) {
+			track_class_dependency(fe_ce, fe_class_name);
+			return INHERITANCE_SUCCESS;
+		}
+	}
+
 	zend_type *single_type;
 
 	/* Traverse the list of parent types and check if the current child (FE)
@@ -571,18 +583,6 @@ static inheritance_status zend_is_class_subtype_of_type(
 		return INHERITANCE_UNRESOLVED;
 	}
 
-	/* Replacing static with self in final classes is okay */
-	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) {
-			return INHERITANCE_SUCCESS;
-		}
-
-		return INHERITANCE_ERROR;
-	}
-
 	return is_intersection ? INHERITANCE_SUCCESS : INHERITANCE_ERROR;
 }