Support PHP 8.4 property hooks in AST version 110 #241
Conversation
Add 'hooks' child of type `AST_PROPERTY_HOOK` to `AST_PROP_ELEM` and `AST_PARAM` (constructor property promotion). Add test of `new X()->propName` Fixes nikic#240
TysonAndre
force-pushed
the
support-php-8.4
branch
from
d459695 to
35ed2cc
Compare
ast.c
Outdated
| @@ -1037,6 +1071,11 @@ static void ast_to_zval(zval *zv, zend_ast *ast, ast_state_info_t *state) { | |||
| // This is an undeclared dynamic property and has no cache slot. | |||
| ast_update_property_long(zv, AST_STR(str_endLineno), decl->end_lineno); | |||
|
|
|||
| #if PHP_VERSION_ID >= 80400 | |||
| if (kind == ZEND_AST_CLOSURE || kind == ZEND_AST_ARROW_FUNC) { | |||
| ZVAL_STR(&tmp_zv, AST_STR(str_bracketed_closure)); | |||
There was a problem hiding this comment.
It's because of https://github.com/php/php-src/pull/13550/files#diff-3e6742a9069b5717cf961c9d6b2aefbd1c730869d8a58123b1b5f3bc3e9082fc - php 8.4-dev has the name of closures be null instead of the old literal string {closure}.
This affects unit tests, but shouldn't really affect phan.
This could probably be extended to be consistently null in versions 110+ of php-ast.
There was a problem hiding this comment.
Or have the field be omitted entirely for closures and arrow functions.
There was a problem hiding this comment.
Probably omitting it entirely would be best. But we can leave that for a followup.
README.md
Outdated
| AST_PROP_GROUP: type, props, attributes // version 70+ | ||
| AST_PROPERTY_HOOK: name, docComment, params, stmts, returnType, attributes // version 110+ |
ast.c
Outdated
| @@ -1037,6 +1071,11 @@ static void ast_to_zval(zval *zv, zend_ast *ast, ast_state_info_t *state) { | |||
| // This is an undeclared dynamic property and has no cache slot. | |||
| ast_update_property_long(zv, AST_STR(str_endLineno), decl->end_lineno); | |||
|
|
|||
| #if PHP_VERSION_ID >= 80400 | |||
| if (kind == ZEND_AST_CLOSURE || kind == ZEND_AST_ARROW_FUNC) { | |||
| ZVAL_STR(&tmp_zv, AST_STR(str_bracketed_closure)); | |||
There was a problem hiding this comment.
Probably omitting it entirely would be best. But we can leave that for a followup.
Add 'hooks' child of type
AST_PROPERTY_HOOKtoAST_PROP_ELEMandAST_PARAM(constructor property promotion).Fixes #240