GH-16067: prevent abstract in methods of anonymous classes

As an extra benefit, the error message now points to the line of the method
rather than just the overall class declaration.

Author: DanielEScherzer

Zend/tests/anon/gh16067.phpt

@@ -8,4 +8,4 @@ $c = new class {
 }
 ?>
 --EXPECTF--
-Fatal error: Class class@anonymous must implement 1 abstract method (class@anonymous::f) in %s on line 3
+Fatal error: Cannot use the abstract modifier on a method of an anonymous class in %s on line 4

Zend/zend_compile.c

@@ -900,14 +900,17 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
 			break;
 		case T_FINAL:
 			if (target == ZEND_MODIFIER_TARGET_METHOD
+				|| target == ZEND_MODIFIER_TARGET_ANON_CLASS_METHOD
 				|| target == ZEND_MODIFIER_TARGET_CONSTANT
 				|| target == ZEND_MODIFIER_TARGET_PROPERTY
 				|| target == ZEND_MODIFIER_TARGET_PROPERTY_HOOK) {
 				return ZEND_ACC_FINAL;
 			}
 			break;
 		case T_STATIC:
-			if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_METHOD) {
+			if (target == ZEND_MODIFIER_TARGET_PROPERTY
+				|| target == ZEND_MODIFIER_TARGET_METHOD
+				|| target == ZEND_MODIFIER_TARGET_ANON_CLASS_METHOD) {
 				return ZEND_ACC_STATIC;
 			}
 			break;
@@ -933,6 +936,8 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
 		member = "property";
 	} else if (target == ZEND_MODIFIER_TARGET_METHOD) {
 		member = "method";
+	} else if (target == ZEND_MODIFIER_TARGET_ANON_CLASS_METHOD) {
+		member = "method of an anonymous class";
 	} else if (target == ZEND_MODIFIER_TARGET_CONSTANT) {
 		member = "class constant";
 	} else if (target == ZEND_MODIFIER_TARGET_CPP) {
@@ -1036,6 +1041,8 @@ uint32_t zend_add_member_modifier(uint32_t flags, uint32_t new_flag, zend_modifi
 			"Multiple readonly modifiers are not allowed", 0);
 		return 0;
 	}
+	// No need for the final+abstract check on anonymous class methods, since
+	// abstract methods are not allowed
 	if (target == ZEND_MODIFIER_TARGET_METHOD && (new_flags & ZEND_ACC_ABSTRACT) && (new_flags & ZEND_ACC_FINAL)) {
 		zend_throw_exception(zend_ce_compile_error,
 			"Cannot use the final modifier on an abstract method", 0);

Zend/zend_compile.h

@@ -891,6 +891,7 @@ void zend_emit_final_return(bool return_one);
 typedef enum {
 	ZEND_MODIFIER_TARGET_PROPERTY = 0,
 	ZEND_MODIFIER_TARGET_METHOD,
+	ZEND_MODIFIER_TARGET_ANON_CLASS_METHOD,
 	ZEND_MODIFIER_TARGET_CONSTANT,
 	ZEND_MODIFIER_TARGET_CPP,
 	ZEND_MODIFIER_TARGET_PROPERTY_HOOK,

Zend/zend_language_parser.y

@@ -258,6 +258,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> foreach_statement declare_statement finally_statement unset_variable variable
 %type <ast> extends_from parameter optional_type_without_static argument global_var
 %type <ast> static_var class_statement trait_adaptation trait_precedence trait_alias
+%type <ast> class_statement_anon class_statement_list_anon
 %type <ast> absolute_trait_method_reference trait_method_reference property echo_expr
 %type <ast> new_dereferenceable new_non_dereferenceable anonymous_class class_name class_name_reference simple_variable
 %type <ast> internal_functions_in_yacc
@@ -278,6 +279,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> isset_variable type return_type type_expr type_without_static
 %type <ast> identifier type_expr_without_static union_type_without_static_element union_type_without_static intersection_type_without_static
 %type <ast> inline_function union_type_element union_type intersection_type
+%type <ast> attributed_class_statement_common attributed_class_statement_anon
 %type <ast> attributed_statement attributed_class_statement attributed_parameter
 %type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
 %type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
@@ -288,6 +290,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 %type <num> returns_ref function fn is_reference is_variadic property_modifiers property_hook_modifiers
 %type <num> method_modifiers class_const_modifiers member_modifier optional_cpp_modifiers
+%type <num> method_modifiers_anon
 %type <num> class_modifiers class_modifier anonymous_class_modifiers anonymous_class_modifiers_optional use_type backup_fn_flags
 
 %type <ptr> backup_lex_pos
@@ -941,8 +944,17 @@ class_statement_list:
 			{ $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
 ;
 
+class_statement_list_anon:
+		class_statement_list_anon class_statement_anon
+			{ $$ = zend_ast_list_add($1, $2); }
+	|	%empty
+			{ $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
+;
 
-attributed_class_statement:
+/* Attributed class statements allowed in anonymous classes as well as normal
+ * classes/interfaces/traits/enums
+ */
+attributed_class_statement_common:
 		property_modifiers optional_type_without_static property_list ';'
 			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, $3, NULL);
 			  $$->attr = $1; }
@@ -955,11 +967,23 @@ attributed_class_statement:
 	|	class_const_modifiers T_CONST type_expr class_const_list ';'
 			{ $$ = zend_ast_create(ZEND_AST_CLASS_CONST_GROUP, $4, NULL, $3);
 			  $$->attr = $1; }
+	|	enum_case { $$ = $1; }
+;
+
+attributed_class_statement:
+		attributed_class_statement_common { $$ = $1; }
 	|	method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')'
 		return_type backup_fn_flags method_body backup_fn_flags
-			{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5,
-				  zend_ast_get_str($4), $7, NULL, $11, $9, NULL); CG(extra_fn_flags) = $10; }
-	|	enum_case { $$ = $1; }
+		{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5,
+				zend_ast_get_str($4), $7, NULL, $11, $9, NULL); CG(extra_fn_flags) = $10; }
+;
+
+attributed_class_statement_anon:
+		attributed_class_statement_common { $$ = $1; }
+	|	method_modifiers_anon function returns_ref identifier backup_doc_comment '(' parameter_list ')'
+		return_type backup_fn_flags method_body backup_fn_flags
+		{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5,
+				zend_ast_get_str($4), $7, NULL, $11, $9, NULL); CG(extra_fn_flags) = $10; }
 ;
 
 class_statement:
@@ -969,6 +993,13 @@ class_statement:
 			{ $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); }
 ;
 
+class_statement_anon:
+		attributed_class_statement_anon { $$ = $1; }
+	|	attributes attributed_class_statement_anon { $$ = zend_ast_with_attributes($2, $1); }
+	|	T_USE class_name_list trait_adaptations
+			{ $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); }
+;
+
 class_name_list:
 		class_name { $$ = zend_ast_create_list(1, ZEND_AST_NAME_LIST, $1); }
 	|	class_name_list ',' class_name { $$ = zend_ast_list_add($1, $3); }
@@ -1049,6 +1080,15 @@ method_modifiers:
 			  if (!($$ & ZEND_ACC_PPP_MASK)) { $$ |= ZEND_ACC_PUBLIC; } }
 ;
 
+method_modifiers_anon:
+		%empty
+			{ $$ = ZEND_ACC_PUBLIC; }
+	|	non_empty_member_modifiers
+			{ $$ = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_ANON_CLASS_METHOD, $1);
+			  if (!$$) { YYERROR; }
+			  if (!($$ & ZEND_ACC_PPP_MASK)) { $$ |= ZEND_ACC_PUBLIC; } }
+;
+
 class_const_modifiers:
 		%empty
 			{ $$ = ZEND_ACC_PUBLIC; }
@@ -1179,7 +1219,7 @@ non_empty_for_exprs:
 
 anonymous_class:
 		anonymous_class_modifiers_optional T_CLASS { $<num>$ = CG(zend_lineno); } ctor_arguments
-		extends_from implements_list backup_doc_comment '{' class_statement_list '}' {
+		extends_from implements_list backup_doc_comment '{' class_statement_list_anon '}' {
 			zend_ast *decl = zend_ast_create_decl(
 				ZEND_AST_CLASS, ZEND_ACC_ANON_CLASS | $1, $<num>3, $7, NULL,
 				$5, $6, $9, NULL, NULL);