Skip to content

Fix GH-17101 (AST->string does not reproduce constructor property promotion correctly) #17133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix GH-17101 (AST->string does not reproduce constructor property promotion correctly) #17133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3acba8
Export visibility for promoted property
nielsdos Dec 12, 2024
45f47d2
Extract hook export code
nielsdos Dec 12, 2024
ca3013b
Fix property hook name mismatch
nielsdos Dec 12, 2024
225847f
Print hooks in parameter exports
nielsdos Dec 12, 2024
bb5e960
Add test for GH-17101
nielsdos Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Zend/tests/property_hooks/gh17101.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--TEST--
GH-17101 (AST->string does not reproduce constructor property promotion correctly)
--FILE--
<?php

try {
assert(false && new class {
public function __construct( #[Foo] public private(set) bool $boolVal = false { final set => $this->boolVal = 1;} ) {}
});
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

?>
--EXPECT--
assert(false && new class {
public function __construct(#[Foo] public private(set) bool $boolVal = false {
final set => $this->boolVal = 1;
}) {
}

})
92 changes: 48 additions & 44 deletions Zend/zend_ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,6 +1744,44 @@ static ZEND_COLD void zend_ast_export_type(smart_str *str, zend_ast *ast, int in
zend_ast_export_ns_name(str, ast, 0, indent);
}

static ZEND_COLD void zend_ast_export_hook_list(smart_str *str, zend_ast_list *hook_list, int indent)
{
smart_str_appends(str, " {");
smart_str_appendc(str, '\n');
indent++;
zend_ast_export_indent(str, indent);

for (uint32_t i = 0; i < hook_list->children; i++) {
zend_ast_decl *hook = (zend_ast_decl *)hook_list->child[i];
zend_ast_export_visibility(str, hook->flags, ZEND_MODIFIER_TARGET_PROPERTY);
if (hook->flags & ZEND_ACC_FINAL) {
smart_str_appends(str, "final ");
}
smart_str_append(str, hook->name);
zend_ast *body = hook->child[2];
if (body == NULL) {
smart_str_appendc(str, ';');
} else if (body->kind == ZEND_AST_PROPERTY_HOOK_SHORT_BODY) {
smart_str_appends(str, " => ");
zend_ast_export_ex(str, body->child[0], 0, indent);
smart_str_appendc(str, ';');
} else {
smart_str_appends(str, " {\n");
zend_ast_export_stmt(str, body, indent + 1);
zend_ast_export_indent(str, indent);
smart_str_appendc(str, '}');
}
if (i < (hook_list->children - 1)) {
smart_str_appendc(str, '\n');
zend_ast_export_indent(str, indent);
}
}
smart_str_appendc(str, '\n');
indent--;
zend_ast_export_indent(str, indent);
smart_str_appendc(str, '}');
}

#define BINARY_OP(_op, _p, _pl, _pr) do { \
op = _op; \
p = _p; \
Expand Down Expand Up @@ -2389,49 +2427,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
}

if (ast->child[3]) {
zend_ast_list *hook_list = zend_ast_get_list(ast->child[3]);

smart_str_appends(str, " {");
smart_str_appendc(str, '\n');
indent++;
zend_ast_export_indent(str, indent);

for (uint32_t i = 0; i < hook_list->children; i++) {
zend_ast_decl *hook = (zend_ast_decl *)hook_list->child[i];
zend_ast_export_visibility(str, hook->flags, ZEND_MODIFIER_TARGET_PROPERTY);
if (hook->flags & ZEND_ACC_FINAL) {
smart_str_appends(str, "final ");
}
switch (i) {
case ZEND_PROPERTY_HOOK_GET:
smart_str_appends(str, "get");
break;
case ZEND_PROPERTY_HOOK_SET:
smart_str_appends(str, "set");
break;
}
zend_ast *body = hook->child[2];
if (body == NULL) {
smart_str_appendc(str, ';');
} else if (body->kind == ZEND_AST_PROPERTY_HOOK_SHORT_BODY) {
smart_str_appends(str, " => ");
zend_ast_export_ex(str, body->child[0], 0, indent);
smart_str_appendc(str, ';');
} else {
smart_str_appends(str, " {\n");
zend_ast_export_stmt(str, body, indent + 1);
zend_ast_export_indent(str, indent);
smart_str_appendc(str, '}');
}
if (i < (hook_list->children - 1)) {
smart_str_appendc(str, '\n');
zend_ast_export_indent(str, indent);
}
}
smart_str_appendc(str, '\n');
indent--;
zend_ast_export_indent(str, indent);
smart_str_appendc(str, '}');
zend_ast_export_hook_list(str, zend_ast_get_list(ast->child[3]), indent);
}
break;
case ZEND_AST_CONST_ELEM:
Expand Down Expand Up @@ -2558,6 +2554,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
if (ast->child[3]) {
zend_ast_export_attributes(str, ast->child[3], indent, 0);
}
zend_ast_export_visibility(str, ast->attr, ZEND_MODIFIER_TARGET_CPP);
if (ast->child[0]) {
zend_ast_export_type(str, ast->child[0], indent);
smart_str_appendc(str, ' ');
Expand All @@ -2570,7 +2567,14 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
}
smart_str_appendc(str, '$');
zend_ast_export_name(str, ast->child[1], 0, indent);
APPEND_DEFAULT_VALUE(2);
if (ast->child[2]) {
smart_str_appends(str, " = ");
zend_ast_export_ex(str, ast->child[2], 0, indent);
}
if (ast->child[5]) {
zend_ast_export_hook_list(str, zend_ast_get_list(ast->child[5]), indent);
}
break;
case ZEND_AST_ENUM_CASE:
if (ast->child[3]) {
zend_ast_export_attributes(str, ast->child[3], indent, 1);
Expand Down
Loading