Resolve relative class type at compile time

Zend/tests/magic_methods_021.phpt

@@ -12,7 +12,7 @@ class Foo2 {
 }
 
 class Foo3 {
-    public static function __set_state(array $data): Foo3|self {}
+    public static function __set_state(array $data): Foo3|Foo2 {}
 }
 
 ?>

Zend/tests/traits/trait_parent_type_in_class_no_parent.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Cannot use a trait which references parent as a type in a class with no parent, single type
+--FILE--
+<?php
+trait TraitExample {
+    public function bar(): parent { return parent::class; }
+}
+
+class A {
+    use TraitExample;
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use trait which has "parent" as a type when current class scope has no parent in %s on line %d

Zend/tests/traits/trait_parent_type_in_class_no_parent_variation2.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Cannot use a trait which references parent as a type in a class with no parent, nullable type
+--FILE--
+<?php
+trait TraitExample {
+    public function bar(): ?parent { return parent::class; }
+}
+
+class A {
+    use TraitExample;
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use trait which has "parent" as a type when current class scope has no parent in %s on line %d

Zend/tests/traits/trait_parent_type_in_class_no_parent_variation3.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Cannot use a trait which references parent as a type in a class with no parent, union type
+--FILE--
+<?php
+trait TraitExample {
+    public function bar(): int|parent { return parent::class; }
+}
+
+class A {
+    use TraitExample;
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use trait which has "parent" as a type when current class scope has no parent in %s on line %d

Zend/tests/traits/trait_parent_type_in_class_no_parent_variation4.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Cannot use a trait which references parent as a type in a class with no parent, DNF type
+--FILE--
+<?php
+trait TraitExample {
+    public function bar(): (X&Y)|parent { return parent::class; }
+}
+
+class A {
+    use TraitExample;
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use trait which has "parent" as a type when current class scope has no parent in %s on line %d

Zend/tests/type_declarations/intersection_types/invalid_types/invalid_parent_type.phpt → Zend/tests/type_declarations/intersection_types/invalid_types/invalid_unresolved_relative_type_parent.phpt

@@ -1,11 +1,9 @@
 --TEST--
-parent type cannot take part in an intersection type
+parent type cannot take part in an intersection type when unresolved
 --FILE--
 <?php
 
-class A {}
-
-class B extends A {
+trait T {
     public function foo(): parent&Iterator {}
 }
 

Zend/tests/type_declarations/intersection_types/invalid_types/invalid_self_type.phpt → Zend/tests/type_declarations/intersection_types/invalid_types/invalid_unresolved_relative_type_self.phpt

@@ -1,9 +1,9 @@
 --TEST--
-self type cannot take part in an intersection type
+self type cannot take part in an intersection type when unresolved
 --FILE--
 <?php
 
-class A {
+trait T {
     public function foo(): self&Iterator {}
 }
 

Zend/tests/type_declarations/intersection_types/resolved_relative_type_valid.phpt

@@ -0,0 +1,19 @@
+--TEST--
+parent/self type can take part in an intersection type if it is resolvable at compile time
+--FILE--
+<?php
+
+class A {}
+
+class B extends A {
+    public function foo(): parent&Iterator {}
+}
+
+class C extends A {
+    public function foo(): self&Iterator {}
+}
+
+?>
+==DONE==
+--EXPECT--
+==DONE==

Zend/tests/type_declarations/relative_class_types/invalid_types/invalid_parent_type_outside_class.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot use parent type outside a class
+--FILE--
+<?php
+
+function foo($x): parent {};
+
+?>
+--EXPECTF--
+Fatal error: Cannot use "parent" when no class scope is active in %s on line %d

Zend/tests/type_declarations/relative_class_types/invalid_types/invalid_self_type_outside_class.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot use self type outside a class
+--FILE--
+<?php
+
+function foo($x): self {};
+
+?>
+--EXPECTF--
+Fatal error: Cannot use "self" when no class scope is active in %s on line %d

Zend/tests/type_declarations/relative_class_types/invalid_types/invalid_static_type_outside_class.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot use static type outside a class
+--FILE--
+<?php
+
+function foo($x): static {};
+
+?>
+--EXPECTF--
+Fatal error: Cannot use "static" when no class scope is active in %s on line %d

Zend/tests/type_declarations/relative_class_types/relative_type_in_closures.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Relative class types can be used for closures as it may be bound to a class
+--FILE--
+<?php
+
+$fn1 = function($x): self {};
+$fn2 = function($x): parent {};
+$fn3 = function($x): static {};
+
+?>
+DONE
+--EXPECT--
+DONE

Zend/tests/type_declarations/relative_class_types/relative_type_in_evaled_class_using_trait.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Eval Class definition should not leak memory when using compiled traits
+--FILE--
+<?php
+
+trait TraitCompiled {
+    public function bar(): self { return new self; }
+}
+
+const EVAL_CODE = <<<'CODE'
+class A {
+    use TraitCompiled;
+}
+CODE;
+
+eval(EVAL_CODE);
+
+$a1 = new A();
+$a2 = $a1->bar();
+var_dump($a2);
+
+?>
+DONE
+--EXPECT--
+object(A)#2 (0) {
+}
+DONE

Zend/tests/type_declarations/relative_class_types/relative_type_in_evaled_trait.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Eval code should not leak memory when using traits
+--FILE--
+<?php
+
+const EVAL_CODE = <<<'CODE'
+trait TraitEval {
+    public function bar(): self { return new self; }
+}
+CODE;
+
+eval(EVAL_CODE);
+
+class A {
+    use TraitEval;
+}
+
+$a1 = new A();
+$a2 = $a1->bar();
+var_dump($a2);
+
+?>
+DONE
+--EXPECT--
+object(A)#2 (0) {
+}
+DONE

Zend/tests/type_declarations/union_types/redundant_types/duplicate_relative_class_parent_type.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Duplicate parent type
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data) {}
+}
+class Bar extends Foo {
+    public function method(array $data): parent|parent {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_relative_class_self_type.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Duplicate self type
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data): self|self {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_relative_class_static_type.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Duplicate static type
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data): static|static {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type static is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_resolved_relative_class_type_variation1.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Relative class type self resolving to an existing entry (after variation)
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data): Foo|self {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_resolved_relative_class_type_variation2.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Relative class type self resolving to an existing entry (before variation)
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data): self|Foo {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_resolved_relative_class_type_variation3.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Relative class type parent resolving to an existing entry (after variation)
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data) {}
+}
+class Bar extends Foo {
+    public function method(array $data): Foo|parent {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d

Zend/tests/type_declarations/union_types/redundant_types/duplicate_resolved_relative_class_type_variation4.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Relative class type parent resolving to an existing entry (before variation)
+--FILE--
+<?php
+
+class Foo {
+    public function method(array $data) {}
+}
+class Bar extends Foo {
+    public function method(array $data): parent|Foo {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate type Foo is redundant in %s on line %d