feat(zend): allow generic type arguments on array, iterable, self, static, and parent

Signed-off-by: azjezz <azjezz@protonmail.com>

Author: azjezz

Zend/zend_ast.c

@@ -2065,7 +2065,13 @@ static ZEND_COLD void zend_ast_export_type(smart_str *str, zend_ast *ast, int in
 		if (ast->attr & ZEND_TYPE_NULLABLE) {
 			smart_str_appendc(str, '?');
 		}
-		zend_ast_export_ns_name(str, ast->child[0], 0, indent);
+
+		zend_ast *name_ast = ast->child[0];
+		if (name_ast->kind == ZEND_AST_TYPE) {
+			zend_ast_export_type(str, name_ast, indent);
+		} else {
+			zend_ast_export_ns_name(str, name_ast, 0, indent);
+		}
 		zend_ast_export_generic_type_argument_list(str, ast->child[1], indent);
 		return;
 	}

Zend/zend_compile.c

@@ -579,12 +579,27 @@ static zend_type zend_compile_pre_erasure_typename(zend_ast *ast)
 		zend_ast *name_ast = ast->child[0];
 		zend_ast_list *args_list = zend_ast_get_list(ast->child[1]);
 		zend_type_named_with_args *payload = emalloc(ZEND_TYPE_NAMED_WITH_ARGS_SIZE(args_list->children));
-		payload->name = zend_string_copy(zval_make_interned_string(zend_ast_get_zval(name_ast)));
-		payload->name_attr = name_ast->attr;
+		if (name_ast->kind == ZEND_AST_TYPE) {
+			const char *cname;
+			switch (name_ast->attr) {
+				case IS_ARRAY:    cname = "array";    break;
+				case IS_STATIC:   cname = "static";   break;
+				default:
+					ZEND_UNREACHABLE();
+			}
+
+			payload->name = zend_string_init_interned(cname, strlen(cname), 0);
+			payload->name_attr = 0;
+		} else {
+			payload->name = zend_string_copy(zval_make_interned_string(zend_ast_get_zval(name_ast)));
+			payload->name_attr = name_ast->attr;
+		}
+
 		payload->count = args_list->children;
 		for (uint32_t i = 0; i < args_list->children; i++) {
 			payload->args[i] = zend_compile_pre_erasure_typename(args_list->child[i]);
 		}
+
 		ZEND_TYPE_SET_PTR(result, payload);
 		ZEND_TYPE_FULL_MASK(result) |= _ZEND_TYPE_NAMED_WITH_ARGS_BIT;
 	} else if (ast->kind == ZEND_AST_TYPE) {

Zend/zend_language_parser.y

@@ -943,7 +943,9 @@ type_expr:
 
 type:
 		type_without_static	{ $$ = $1; }
-	|	T_STATIC			{ $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_STATIC); }
+	|	T_STATIC optional_generic_type_argument_list
+			{ zend_ast *bare = zend_ast_create_ex(ZEND_AST_TYPE, IS_STATIC);
+			  $$ = $2 ? zend_ast_create(ZEND_AST_GENERIC_NAMED_TYPE, bare, $2) : bare; }
 ;
 
 union_type_element:
@@ -974,7 +976,9 @@ type_expr_without_static:
 ;
 
 type_without_static:
-		T_ARRAY		{ $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }
+		T_ARRAY optional_generic_type_argument_list
+			{ zend_ast *bare = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY);
+			  $$ = $2 ? zend_ast_create(ZEND_AST_GENERIC_NAMED_TYPE, bare, $2) : bare; }
 	|	T_CALLABLE	{ $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); }
 	|	name optional_generic_type_argument_list
 			{ $$ = $2 ? zend_ast_create(ZEND_AST_GENERIC_NAMED_TYPE, $1, $2) : $1; }