allow generics in non-static types

lcarilla · lcarilla · commit 73f9ca1d4260 · 2025-04-01T00:51:36.000+02:00
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -882,10 +882,11 @@ type_expr_without_static:
 	|	intersection_type_without_static	{ $$ = $1; }
 ;
 
+//TODO add generic type params to AST
 type_without_static:
-		T_ARRAY		{ $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }
+		T_ARRAY	 generic_type_parameters  { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }
 	|	T_CALLABLE	{ $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); }
-	|	name		{ $$ = $1; }
+	|	name generic_type_parameters  { $$ = $1; }
 ;
 
 union_type_without_static_element:

Original file line number	Diff line number	Diff line change
`@@ -882,10 +882,11 @@ type_expr_without_static:`
`882`	`882`	`\| intersection_type_without_static { $$ = $1; }`
`883`	`883`	`;`
`884`	`884`
	`885`	`+//TODO add generic type params to AST`
`885`	`886`	`type_without_static:`
`886`		`- T_ARRAY { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }`
	`887`	`+ T_ARRAY generic_type_parameters { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); }`
`887`	`888`	`\| T_CALLABLE { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); }`
`888`		`- \| name { $$ = $1; }`
	`889`	`+ \| name generic_type_parameters { $$ = $1; }`
`889`	`890`	`;`
`890`	`891`
`891`	`892`	`union_type_without_static_element:`