Associate type to CE and minimal duplicate check

Author: Girgias

Zend/tests/type_declarations/associated/multiple_associated_type.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Multiple associated types
+--FILE--
+<?php
+
+interface I {
+    type K;
+    type V;
+    public function set(K $key, V $value): void;
+    public function get(K $key): V;
+}
+
+class C implements I {
+    public function set(int $key, string $value): void {}
+    public function get(int $key): string {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Declaration of C::set(int $key, string $value): void must be compatible with I::set(K $key, V $value): void in %s on line %d

Zend/tests/type_declarations/associated/repeated_associated_type.phpt

@@ -1,9 +1,10 @@
 --TEST--
-Associated types basic
+Repeated associated type
 --FILE--
 <?php
 
 interface I {
+    type T;
     type T;
     public function foo(T $param): T;
 }
@@ -14,4 +15,4 @@ class C implements I {
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected token "type", expecting "function" in %s on line %d
+Fatal error: Cannot have two associated types with the same name "T" in %s on line %d

Zend/zend.h

@@ -218,6 +218,9 @@ struct _zend_class_entry {
 	zend_trait_precedence **trait_precedences;
 	HashTable *attributes;
 
+	/* Only for interfaces */
+	HashTable *associated_types;
+
 	uint32_t enum_backing_type;
 	HashTable *backed_enum_table;
 

Zend/zend_compile.c

@@ -2072,6 +2072,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_hand
 	ce->default_static_members_count = 0;
 	ce->properties_info_table = NULL;
 	ce->attributes = NULL;
+	ce->associated_types = NULL;
 	ce->enum_backing_type = IS_UNDEF;
 	ce->backed_enum_table = NULL;
 
@@ -9011,18 +9012,33 @@ static void zend_compile_use_trait(zend_ast *ast) /* {{{ */
 }
 /* }}} */
 
+
+
 static void zend_compile_associated_type(zend_ast *ast) {
 	zend_class_entry *ce = CG(active_class_entry);
+	HashTable *associated_types = ce->associated_types;
+	zend_ast *name_ast = ast->child[0];
+	zend_string *name = zend_ast_get_str(name_ast);
 
 	if ((ce->ce_flags & ZEND_ACC_INTERFACE) == 0) {
 		zend_error_noreturn(E_COMPILE_ERROR,
 			"Cannot use associated types outside of interfaces, used in %s", ZSTR_VAL(ce->name));
 	}
 
-	zend_ast *name_ast = ast->child[0];
-	zend_string *name = zend_ast_get_str(name_ast);
 	ZEND_ASSERT(name != NULL);
-	// TODO add associated type to CE
+	bool persistent = ce->type == ZEND_INTERNAL_CLASS;
+	if (associated_types == NULL) {
+		ce->associated_types = pemalloc(sizeof(HashTable), persistent);
+		zend_hash_init(ce->associated_types, 8, NULL, NULL, persistent);
+		associated_types = ce->associated_types;
+	}
+	if (zend_hash_exists(associated_types, name)) {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Cannot have two associated types with the same name \"%s\"", ZSTR_VAL(name));
+	}
+	zval tmp;
+	ZVAL_UNDEF(&tmp);
+	zend_hash_add_new(associated_types, name, &tmp);
 }
 
 static void zend_compile_implements(zend_ast *ast) /* {{{ */

Zend/zend_opcode.c

@@ -351,6 +351,10 @@ ZEND_API void destroy_zend_class(zval *zv)
 					zend_hash_release(ce->attributes);
 				}
 
+				if (ce->associated_types) {
+					zend_hash_release(ce->associated_types);
+				}
+
 				if (ce->num_interfaces > 0 && !(ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES)) {
 					uint32_t i;
 
@@ -527,6 +531,9 @@ ZEND_API void destroy_zend_class(zval *zv)
 			if (ce->attributes) {
 				zend_hash_release(ce->attributes);
 			}
+			if (ce->associated_types) {
+				zend_hash_release(ce->associated_types);
+			}
 			free(ce);
 			break;
 	}