Handle final/abstract/readonly for structs

Author: iluuu1994

Zend/tests/structs/abstract.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Structs must not be marked as abstract
+--FILE--
+<?php
+
+abstract struct Box {}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use the abstract modifier on a struct, as structs are implicitly final in %s on line %d

Zend/tests/structs/final.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Structs must not be marked as final
+--FILE--
+<?php
+
+final struct Box {}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use the final modifier on a struct, as structs are implicitly final in %s on line %d

Zend/tests/structs/readonly.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Structs may be marked as readonly
+--FILE--
+<?php
+
+readonly struct Box {
+    public function __construct(
+        public mixed $value,
+    ) {}
+}
+
+$a = new Box(42);
+$b = new Box(42);
+var_dump($a === $b);
+
+try {
+    $b->value = 43;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+bool(true)
+Cannot modify readonly property Box::$value

Zend/zend_compile.c

@@ -944,6 +944,16 @@ uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
 			"Cannot use the final modifier on an abstract class", 0);
 		return 0;
 	}
+	if ((new_flags & ZEND_ACC_STRUCT) && (new_flags & ZEND_ACC_FINAL)) {
+		zend_throw_exception(zend_ce_compile_error,
+			"Cannot use the final modifier on a struct, as structs are implicitly final", 0);
+		return 0;
+	}
+	if ((new_flags & ZEND_ACC_STRUCT) && (new_flags & ZEND_ACC_ABSTRACT)) {
+		zend_throw_exception(zend_ce_compile_error,
+			"Cannot use the abstract modifier on a struct, as structs are implicitly final", 0);
+		return 0;
+	}
 	return new_flags;
 }
 /* }}} */
@@ -8257,10 +8267,6 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 
 	zend_class_entry *original_ce = CG(active_class_entry);
 
-	if (decl->flags & ZEND_ACC_STRUCT) {
-		// TODO: ABSTRACT, FINAL, READONLY
-	}
-
 	if (EXPECTED((decl->flags & ZEND_ACC_ANON_CLASS) == 0)) {
 		zend_string *unqualified_name = decl->name;
 

Zend/zend_language_parser.y

@@ -595,9 +595,9 @@ is_variadic:
 ;
 
 class_declaration_statement:
-		class_modifiers class_like { $<num>$ = CG(zend_lineno); }
+		class_modifiers class_like { $<num>$ = zend_add_class_modifier($1, $2); if (!$<num>$) { YYERROR; } } { $<num>$ = CG(zend_lineno); }
 		T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
-			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, $1 | $2, $<num>3, $7, zend_ast_get_str($4), $5, $6, $9, NULL, NULL); }
+			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, $<num>3, $<num>4, $8, zend_ast_get_str($5), $6, $7, $10, NULL, NULL); }
 	|	class_like { $<num>$ = CG(zend_lineno); }
 		T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, $1, $<num>2, $6, zend_ast_get_str($3), $4, $5, $8, NULL, NULL); }