Add basic support for extending interfaces with associated type

Author: Girgias

Diff for: Zend/tests/type_declarations/associated/extended_interface_associated_type_redeclared.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Associated type behaviour in extended interface
+--FILE--
+<?php
+
+interface I {
+    type T : int|string;
+    public function foo(T $param): T;
+}
+
+interface I2 extends I {
+    type T;
+    public function bar(int $o, T $param): T;
+}
+
+class C implements I2 {
+    public function foo(string $param): string {}
+    public function bar(int $o, float $param): float {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare associated type T in interface I2 inherited from interface I in %s on line %d

Diff for: Zend/tests/type_declarations/associated/extended_interface_associated_types.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Associated type behaviour in extended interface
+--FILE--
+<?php
+
+interface I {
+    type T : int|string|(Traversable&Countable);
+    public function foo(T $param): T;
+}
+
+interface I2 extends I {
+    public function bar(int $o, T $param): T;
+}
+
+class C implements I2 {
+    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 for: Zend/tests/type_declarations/associated/extended_interface_new_associated_types.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Associated type behaviour in extended interface
+--FILE--
+<?php
+
+interface I {
+    type T : int|string|(Traversable&Countable);
+    public function foo(T $param): T;
+}
+
+interface I2 extends I {
+    type T2 : float|bool|stdClass;
+    public function bar(T2 $o, T $param): T2;
+}
+
+class C implements I2 {
+    public function foo(string $param): string {}
+    public function bar(float $o, string $param): float {}
+}
+
+// TODO: Ideally error message would be:
+//Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(T2<stdClass|float|bool> $o, T<(Traversable&Countable)|int|string> $param): T2<stdClass|float|bool> in %s on line %d
+//Improve zend_append_type_hint()?
+?>
+--EXPECTF--
+Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(T2<stdClass|float|bool> $o, T $param): T2<stdClass|float|bool> in %s on line %d

Diff for: Zend/zend_inheritance.c

@@ -2232,8 +2232,31 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
 	}
 
 	if (iface->associated_types) {
+		const uint32_t num_associated_types = zend_hash_num_elements(iface->associated_types);
+		if (ce->ce_flags & ZEND_ACC_INTERFACE) {
+			const bool persistent = ce->type == ZEND_INTERNAL_CLASS;
+			if (ce->associated_types) {
+				zend_string *associated_type_name;
+				zend_type *associated_type_ptr;
+				ZEND_HASH_FOREACH_STR_KEY_PTR(iface->associated_types, associated_type_name, associated_type_ptr) {
+					if (zend_hash_exists(ce->associated_types, associated_type_name)) {
+						zend_error_noreturn(E_ERROR,
+							"Cannot redeclare associated type %s in interface %s inherited from interface %s",
+							ZSTR_VAL(associated_type_name), ZSTR_VAL(ce->name), ZSTR_VAL(iface->name));
+					}
+					/* Deep copy the type information */
+					zend_type_copy_ctor(associated_type_ptr, /* use_arena */ !persistent, /* persistent */ persistent);
+					zend_hash_add_new_mem(ce->associated_types, associated_type_name, associated_type_ptr, sizeof(*associated_type_ptr));
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ce->associated_types = pemalloc(sizeof(HashTable), persistent);
+				zend_hash_init(ce->associated_types, num_associated_types, NULL, NULL, false);
+				zend_hash_copy(ce->associated_types, iface->associated_types, NULL);
+			}
+			return;
+		}
 		HashTable *ht = emalloc(sizeof(HashTable));
-		zend_hash_init(ht, zend_hash_num_elements(iface->associated_types), NULL, NULL, false);
+		zend_hash_init(ht, num_associated_types, NULL, NULL, false);
 		CG(bound_associated_types) = ht;
 	}
 	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&iface->constants_table, key, c) {