Skip to content

Commit e52684e

Browse files
ndosscheiluuu1994
ndossche
authored and
iluuu1994
committed
Fix GH-10377: Unable to have an anonymous readonly class
This fixes the oversight that an anonymous class should be able to be readonly. Other identifiers such as final and abstract do not make sense. As we still want nice errors for when users try to use these modifiers, or use multiple modifiers, we introduce a new function zend_add_anonymous_class_modifier that will perform verification for anonymous class modifiers, just like zend_add_class_modifier does for non-anonymous classes. Closes GH-10381
1 parent c279400 commit e52684e

File tree

9 files changed

+127
-5
lines changed

9 files changed

+127
-5
lines changed

‎UPGRADING‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ PHP 8.3 UPGRADE NOTES
3131
2. New Features
3232
========================================
3333

34+
- Core
35+
. Anonymous classes may now be marked as readonly.
36+
3437
- Posix
3538
. posix_getrlimit() now takes an optional $res parameter to allow fetching a
3639
single resource limit.

‎Zend/tests/gh10377.phpt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
--TEST--
2+
GH-10377 (Unable to have an anonymous readonly class)
3+
--FILE--
4+
<?php
5+
6+
$readonly_anon = new readonly class {
7+
public int $field;
8+
function __construct() {
9+
$this->field = 2;
10+
}
11+
};
12+
13+
$anon = new class {
14+
public int $field;
15+
function __construct() {
16+
$this->field = 2;
17+
}
18+
};
19+
20+
var_dump($readonly_anon->field);
21+
try {
22+
$readonly_anon->field = 123;
23+
} catch (Error $e) {
24+
echo $e->getMessage() . "\n";
25+
}
26+
var_dump($readonly_anon->field);
27+
28+
var_dump($anon->field);
29+
try {
30+
$anon->field = 123;
31+
} catch (Error $e) {
32+
echo $e->getMessage() . "\n";
33+
}
34+
var_dump($anon->field);
35+
36+
?>
37+
--EXPECT--
38+
int(2)
39+
Cannot modify readonly property class@anonymous::$field
40+
int(2)
41+
int(2)
42+
int(123)

‎Zend/tests/gh10377_1.phpt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
GH-10377 (Unable to have an anonymous readonly class) - usage variation: dynamic properties attribute
3+
--FILE--
4+
<?php
5+
6+
$readonly_anon = new #[AllowDynamicProperties] readonly class {
7+
public int $field;
8+
function __construct() {
9+
$this->field = 2;
10+
}
11+
};
12+
13+
?>
14+
--EXPECTF--
15+
Fatal error: Cannot apply #[AllowDynamicProperties] to readonly class class@anonymous in %s on line %d

‎Zend/tests/gh10377_2.phpt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--TEST--
2+
GH-10377 (Unable to have an anonymous readonly class) - usage variation: abstract modifier
3+
--FILE--
4+
<?php
5+
6+
$x = new abstract class {};
7+
8+
?>
9+
--EXPECTF--
10+
Fatal error: Cannot use the abstract modifier on an anonymous class in %s on line %d

‎Zend/tests/gh10377_3.phpt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--TEST--
2+
GH-10377 (Unable to have an anonymous readonly class) - usage variation: final modifier
3+
--FILE--
4+
<?php
5+
6+
$x = new final class {};
7+
8+
?>
9+
--EXPECTF--
10+
Fatal error: Cannot use the final modifier on an anonymous class in %s on line %d

‎Zend/tests/gh10377_4.phpt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--TEST--
2+
GH-10377 (Unable to have an anonymous readonly class) - usage variation: multiple readonly modifiers
3+
--FILE--
4+
<?php
5+
6+
$x = new readonly readonly class {};
7+
8+
?>
9+
--EXPECTF--
10+
Fatal error: Multiple readonly modifiers are not allowed in %s on line %d

‎Zend/zend_compile.c‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,25 @@ uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
903903
}
904904
/* }}} */
905905

906+
uint32_t zend_add_anonymous_class_modifier(uint32_t flags, uint32_t new_flag)
907+
{
908+
uint32_t new_flags = flags | new_flag;
909+
if (new_flag & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) {
910+
zend_throw_exception(zend_ce_compile_error,
911+
"Cannot use the abstract modifier on an anonymous class", 0);
912+
return 0;
913+
}
914+
if (new_flag & ZEND_ACC_FINAL) {
915+
zend_throw_exception(zend_ce_compile_error, "Cannot use the final modifier on an anonymous class", 0);
916+
return 0;
917+
}
918+
if ((flags & ZEND_ACC_READONLY_CLASS) && (new_flag & ZEND_ACC_READONLY_CLASS)) {
919+
zend_throw_exception(zend_ce_compile_error, "Multiple readonly modifiers are not allowed", 0);
920+
return 0;
921+
}
922+
return new_flags;
923+
}
924+
906925
uint32_t zend_add_member_modifier(uint32_t flags, uint32_t new_flag, zend_modifier_target target) /* {{{ */
907926
{
908927
uint32_t new_flags = flags | new_flag;

‎Zend/zend_compile.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ typedef enum {
817817
zend_ast *zend_ast_append_str(zend_ast *left, zend_ast *right);
818818
zend_ast *zend_negate_num_string(zend_ast *ast);
819819
uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag);
820+
uint32_t zend_add_anonymous_class_modifier(uint32_t flags, uint32_t new_flag);
820821
uint32_t zend_add_member_modifier(uint32_t flags, uint32_t new_flag, zend_modifier_target target);
821822

822823
uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t flags);

‎Zend/zend_language_parser.y‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
282282

283283
%type <num> returns_ref function fn is_reference is_variadic property_modifiers
284284
%type <num> method_modifiers class_const_modifiers member_modifier optional_cpp_modifiers
285-
%type <num> class_modifiers class_modifier use_type backup_fn_flags
285+
%type <num> class_modifiers class_modifier anonymous_class_modifiers anonymous_class_modifiers_optional use_type backup_fn_flags
286286

287287
%type <ptr> backup_lex_pos
288288
%type <str> backup_doc_comment
@@ -601,6 +601,18 @@ class_modifiers:
601601
{ $$ = zend_add_class_modifier($1, $2); if (!$$) { YYERROR; } }
602602
;
603603

604+
anonymous_class_modifiers:
605+
class_modifier
606+
{ $$ = zend_add_anonymous_class_modifier(0, $1); if (!$$) { YYERROR; } }
607+
| anonymous_class_modifiers class_modifier
608+
{ $$ = zend_add_anonymous_class_modifier($1, $2); if (!$$) { YYERROR; } }
609+
;
610+
611+
anonymous_class_modifiers_optional:
612+
%empty { $$ = 0; }
613+
| anonymous_class_modifiers { $$ = $1; }
614+
;
615+
604616
class_modifier:
605617
T_ABSTRACT { $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
606618
| T_FINAL { $$ = ZEND_ACC_FINAL; }
@@ -1095,12 +1107,12 @@ non_empty_for_exprs:
10951107
;
10961108

10971109
anonymous_class:
1098-
T_CLASS { $<num>$ = CG(zend_lineno); } ctor_arguments
1110+
anonymous_class_modifiers_optional T_CLASS { $<num>$ = CG(zend_lineno); } ctor_arguments
10991111
extends_from implements_list backup_doc_comment '{' class_statement_list '}' {
11001112
zend_ast *decl = zend_ast_create_decl(
1101-
ZEND_AST_CLASS, ZEND_ACC_ANON_CLASS, $<num>2, $6, NULL,
1102-
$4, $5, $8, NULL, NULL);
1103-
$$ = zend_ast_create(ZEND_AST_NEW, decl, $3);
1113+
ZEND_AST_CLASS, ZEND_ACC_ANON_CLASS | $1, $<num>3, $7, NULL,
1114+
$5, $6, $9, NULL, NULL);
1115+
$$ = zend_ast_create(ZEND_AST_NEW, decl, $4);
11041116
}
11051117
;
11061118

0 commit comments

Comments
 (0)