[skip ci] Get explicit notation working

Girgias · Girgias · commit 14b6bb77da83 · 2025-05-06T16:26:45.000+01:00
Have a HT null access somewhere...
diff --git a/Zend/tests/type_declarations/abstract_generics/abstract_generic_001.phpt b/Zend/tests/type_declarations/abstract_generics/abstract_generic_001.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Abstract generic types basic
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T $param): T;
+}
+
+class CS implements I<string> {
+    public function foo(string $param): string {
+        return $param . '!';
+    }
+}
+
+class CI implements I<int> {
+    public function foo(int $param): int {
+        return $param + 42;
+    }
+}
+
+$cs = new CS();
+var_dump($cs->foo("Hello"));
+
+$ci = new CI();
+var_dump($ci->foo(5));
+
+?>
+--EXPECT--
+string(6) "Hello!"
+int(47)
diff --git a/Zend/tests/type_declarations/abstract_generics/abstract_generic_type_with_constraint.phpt b/Zend/tests/type_declarations/abstract_generics/abstract_generic_type_with_constraint.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Abstract generic type with a constraint
+--FILE--
+<?php
+
+interface I<T : int|string> {
+    public function foo(T $param): T;
+}
+
+class CS implements I<string> {
+    public function foo(string $param): string {
+        return $param . '!';
+    }
+}
+
+class CI implements I<int> {
+    public function foo(int $param): int {
+        return $param + 42;
+    }
+}
+
+$cs = new CS();
+var_dump($cs->foo("Hello"));
+
+$ci = new CI();
+var_dump($ci->foo(5));
+
+?>
+--EXPECT--
+string(6) "Hello!"
+int(47)
diff --git a/Zend/tests/type_declarations/abstract_generics/abstract_generic_type_with_constraint_failed.phpt b/Zend/tests/type_declarations/abstract_generics/abstract_generic_type_with_constraint_failed.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Abstract generic type with a constraint that is not satisfied
+--FILE--
+<?php
+
+interface I<T : int|string> {
+    public function foo(T $param): T;
+}
+
+class C implements I {
+    public function foo(float $param): float {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Declaration of C::foo(float $param): float must be compatible with I::foo(<T : string|int> $param): <T : string|int> in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_intersection1.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_intersection1.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in intersection (simple intersection with class type)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T&Traversable $param): T&Traversable;
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_intersection2.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_intersection2.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in intersection (DNF type)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(stdClass|(T&Traversable) $param): stdClass|(T&Traversable);
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of an intersection type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union1.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union1.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in union (simple union with built-in type)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T|int $param): T|int;
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of a union type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union2.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union2.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in union (simple union with class type)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T|stdClass $param): T|stdClass;
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of a union type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union3.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union3.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in union (DNF type)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T|(Traversable&Countable) $param): T|(Traversable&Countable);
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of a union type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union4.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union4.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in union (nullable type union with ?)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(?T $param): ?T;
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of a union type in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union5.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_cannot_be_in_union5.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type cannot be in union (forced allowed null)
+--FILE--
+<?php
+
+interface I<T> {
+    public function foo(T $param = null): T;
+}
+
+?>
+--EXPECTF--
+Fatal error: Associated type cannot be part of a union type (implicitly nullable due to default null value) in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_in_class.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_in_class.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type in class is invalid
+--FILE--
+<?php
+
+class C<T> {
+    public function foo(T $param): T;
+}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "<", expecting "{" in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_in_trait.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_in_trait.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type in trait is invalid
+--FILE--
+<?php
+
+trait C<T> {
+    public function foo(T $param): T;
+}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "<", expecting "{" in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_redeclared.phpt b/Zend/tests/type_declarations/abstract_generics/errors/abstract_generic_redeclared.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Abstract generic type that is redeclared
+--FILE--
+<?php
+
+interface I<T, S, T> {
+    public function foo(T&Traversable $param): T&Traversable;
+}
+
+?>
+--EXPECTF--
+Fatal error: Duplicate generic parameter T in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/extended_interface_abstract_generic_types.phpt b/Zend/tests/type_declarations/abstract_generics/extended_interface_abstract_generic_types.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Abstract generic type behaviour in extended interface
+--FILE--
+<?php
+
+interface I<T : int|string|(Traversable&Countable)> {
+    public function foo(T $param): T;
+}
+
+interface I2<T> extends I<T> {
+    public function bar(int $o, T $param): T;
+}
+
+class C implements I2<string> {
+    public function foo(string $param): string {}
+    public function bar(int $o, float $param): float {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Declaration of C::bar(int $o, float $param): float must be compatible with I2::bar(int $o, T $param): T in %s on line %d
diff --git a/Zend/tests/type_declarations/abstract_generics/extended_interface_new_abstract_generic_type.phpt b/Zend/tests/type_declarations/abstract_generics/extended_interface_new_abstract_generic_type.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Abstract generic type behaviour in extended interface
+--FILE--
+<?php
+
+interface I<T : int|string|(Traversable&Countable)> {
+    public function foo(T $param): T;
+}
+
+interface I2<T : int|string|(Traversable&Countable), T2 : float|bool|stdClass> extends I<T> {
+    public function bar(T2 $o, T $param): T2;
+}
+
+class C implements I2<string, float> {
+    public function foo(string $param): string {}
+    public function bar(float $o, string $param): float {}
+}
+
+?>
+DONE
+--EXPECT--
+DONE
diff --git a/Zend/tests/type_declarations/abstract_generics/multiple_abstract_generic_type.phpt b/Zend/tests/type_declarations/abstract_generics/multiple_abstract_generic_type.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Multiple abstract generic type
+--FILE--
+<?php
+
+interface I<K, V> {
+    public function set(K $key, V $value): void;
+    public function get(K $key): V;
+}
+
+class C1 implements I<int, string> {
+    public array $a = [];
+    public function set(int $key, string $value): void {
+        $this->a[$key] = $value . '!';
+    }
+    public function get(int $key): string {
+        return $this->a[$key];
+    }
+}
+
+class C2 implements I<string, object> {
+    public array $a = [];
+    public function set(string $key, object $value): void {
+        $this->a[$key] = $value;
+    }
+    public function get(string $key): object {
+        return $this->a[$key];
+    }
+}
+
+$c1 = new C1();
+$c1->set(5, "Hello");
+var_dump($c1->a);
+var_dump($c1->get(5));
+
+$c2 = new C2();
+$c2->set('C1', $c1);
+var_dump($c2->a);
+var_dump($c2->get('C1'));
+
+try {
+    $c1->set('blah', "Hello");
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+
+?>
+--EXPECTF--
+array(1) {
+  [5]=>
+  string(6) "Hello!"
+}
+string(6) "Hello!"
+array(1) {
+  ["C1"]=>
+  object(C1)#1 (1) {
+    ["a"]=>
+    array(1) {
+      [5]=>
+      string(6) "Hello!"
+    }
+  }
+}
+object(C1)#1 (1) {
+  ["a"]=>
+  array(1) {
+    [5]=>
+    string(6) "Hello!"
+  }
+}
+TypeError: C1::set(): Argument #1 ($key) must be of type int, string given, called in %s on line %d
diff --git a/Zend/zend.h b/Zend/zend.h
@@ -220,6 +220,9 @@ struct _zend_class_entry {
 
 	/* Only for interfaces */
 	HashTable *associated_types;
+	HashTable *bound_types;
+	zend_generic_parameter *generic_parameters;
+	uint32_t num_generic_parameters;
 
 	uint32_t enum_backing_type;
 	HashTable *backed_enum_table;
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
@@ -70,6 +70,8 @@ enum _zend_ast_kind {
 	ZEND_AST_ATTRIBUTE_GROUP,
 	ZEND_AST_MATCH_ARM_LIST,
 	ZEND_AST_MODIFIER_LIST,
+	ZEND_AST_GENERIC_PARAM_LIST,
+	ZEND_AST_GENERIC_ARG_LIST,
 
 	/* 0 child nodes */
 	ZEND_AST_MAGIC_CONST = 0 << ZEND_AST_NUM_CHILDREN_SHIFT,
@@ -155,6 +157,8 @@ enum _zend_ast_kind {
 	ZEND_AST_NAMED_ARG,
 	ZEND_AST_PARENT_PROPERTY_HOOK_CALL,
 	ZEND_AST_ASSOCIATED_TYPE,
+	ZEND_AST_GENERIC_PARAM,
+	ZEND_AST_CLASS_REF,
 
 	/* 3 child nodes */
 	ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT,
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
