Add tests, flag constants for php 8.2 readonly classes (#228)

* Add tests, flag constants for php 8.2 readonly classes

* Address review comments

Author: TysonAndre

README.md

@@ -253,7 +253,8 @@ ast\flags\CLASS_FINAL
 ast\flags\CLASS_TRAIT
 ast\flags\CLASS_INTERFACE
 ast\flags\CLASS_ANONYMOUS
-ast\flags\CLASS_ENUM
+ast\flags\CLASS_ENUM      // php 8.1 enums
+ast\flags\CLASS_READONLY  // php 8.2 readonly classes
 
 // Used by ast\AST_PARAM (combinable)
 ast\flags\PARAM_REF

ast.c

@@ -147,6 +147,7 @@ static const char *class_flags[] = {
 	AST_FLAG(CLASS_INTERFACE),
 	AST_FLAG(CLASS_ANONYMOUS),
 	AST_FLAG(CLASS_ENUM),
+	AST_FLAG(CLASS_READONLY),
 	NULL
 };
 
@@ -842,7 +843,6 @@ static void ast_fill_children_ht(HashTable *ht, zend_ast *ast, ast_state_info_t
 			}
 		}
 #endif
-
 		ZVAL_LONG(&id_zval, state->declIdCounter);
 		state->declIdCounter++;
 		zend_hash_add_new(ht, AST_STR(str___declId), &id_zval);
@@ -990,8 +990,14 @@ static void ast_to_zval(zval *zv, zend_ast *ast, ast_state_info_t *state) {
 
 	if (ast_kind_is_decl(ast->kind)) {
 		zend_ast_decl *decl = (zend_ast_decl *) ast;
+		uint32_t flags = decl->flags;
+#if PHP_VERSION_ID >= 80200
+		if (ast->kind == ZEND_AST_CLASS) {
+			flags &= ~ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+		}
+#endif
 
-		AST_NODE_SET_PROP_FLAGS(obj, decl->flags);
+		AST_NODE_SET_PROP_FLAGS(obj, flags);
 
 		// This is an undeclared dynamic property and has no cache slot.
 		ast_update_property_long(zv, AST_STR(str_endLineno), decl->end_lineno);
@@ -1398,6 +1404,7 @@ PHP_MINIT_FUNCTION(ast) {
 	ast_register_flag_constant("CLASS_INTERFACE", ZEND_ACC_INTERFACE);
 	ast_register_flag_constant("CLASS_ANONYMOUS", ZEND_ACC_ANON_CLASS);
 	ast_register_flag_constant("CLASS_ENUM", ZEND_ACC_ENUM);
+	ast_register_flag_constant("CLASS_READONLY", ZEND_ACC_READONLY_CLASS);
 
 	ast_register_flag_constant("PARAM_REF", ZEND_PARAM_REF);
 	ast_register_flag_constant("PARAM_VARIADIC", ZEND_PARAM_VARIADIC);

ast_stub.php

@@ -143,6 +143,7 @@
 const CLASS_INTERFACE = 1;
 const CLASS_ANONYMOUS = 4;
 const CLASS_ENUM = 268435456;
+const CLASS_READONLY = 65536;
 const PARAM_REF = 8;
 const PARAM_VARIADIC = 16;
 const TYPE_NULL = 1;

package.xml

@@ -32,6 +32,7 @@
 - Change documentation files to properly namespace attributes as `#[\AllowDynamicProperties]`. The reflection attributes are already correct.
 - Deprecated AST versions 50 and 60.
 - Drop support for php <= 7.1
+- Add support for php 8.2 readonly classes. Add `ast\flags\CLASS_READONLY` constant.
  </notes>
  <contents>
   <dir name="/">

php_ast.h

@@ -81,6 +81,10 @@ extern ast_str_globals str_globals;
 # define ZEND_AST_TYPE_INTERSECTION ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 6)
 #endif
 
+#if PHP_VERSION_ID < 80200
+# define ZEND_ACC_READONLY_CLASS (1 << 23)
+#endif
+
 /* Pretend it still exists */
 # define ZEND_AST_LIST ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 1)
 

tests/metadata.phpt

@@ -55,7 +55,7 @@ AST_FUNC_DECL: (combinable) [MODIFIER_PUBLIC, MODIFIER_PROTECTED, MODIFIER_PRIVA
 AST_CLOSURE: (combinable) [MODIFIER_PUBLIC, MODIFIER_PROTECTED, MODIFIER_PRIVATE, MODIFIER_STATIC, MODIFIER_ABSTRACT, MODIFIER_FINAL, MODIFIER_READONLY, FUNC_RETURNS_REF, FUNC_GENERATOR]
 AST_METHOD: (combinable) [MODIFIER_PUBLIC, MODIFIER_PROTECTED, MODIFIER_PRIVATE, MODIFIER_STATIC, MODIFIER_ABSTRACT, MODIFIER_FINAL, MODIFIER_READONLY, FUNC_RETURNS_REF, FUNC_GENERATOR]
 AST_ARROW_FUNC: (combinable) [MODIFIER_PUBLIC, MODIFIER_PROTECTED, MODIFIER_PRIVATE, MODIFIER_STATIC, MODIFIER_ABSTRACT, MODIFIER_FINAL, MODIFIER_READONLY, FUNC_RETURNS_REF, FUNC_GENERATOR]
-AST_CLASS: (combinable) [CLASS_ABSTRACT, CLASS_FINAL, CLASS_TRAIT, CLASS_INTERFACE, CLASS_ANONYMOUS, CLASS_ENUM]
+AST_CLASS: (combinable) [CLASS_ABSTRACT, CLASS_FINAL, CLASS_TRAIT, CLASS_INTERFACE, CLASS_ANONYMOUS, CLASS_ENUM, CLASS_READONLY]
 AST_MAGIC_CONST: [MAGIC_LINE, MAGIC_FILE, MAGIC_DIR, MAGIC_NAMESPACE, MAGIC_FUNCTION, MAGIC_METHOD, MAGIC_CLASS, MAGIC_TRAIT]
 AST_TYPE: [TYPE_NULL, TYPE_FALSE, TYPE_BOOL, TYPE_LONG, TYPE_DOUBLE, TYPE_STRING, TYPE_ARRAY, TYPE_OBJECT, TYPE_CALLABLE, TYPE_VOID, TYPE_ITERABLE, TYPE_STATIC, TYPE_MIXED, TYPE_NEVER]
 AST_CALLABLE_CONVERT: []

tests/php82_metadata.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Dynamic property support in php 8.2+
 --SKIPIF--
-<?php if (!class_exists('AllowDynamicProperties')) die('skip PHP >=8.2 only'); ?>
+<?php if (PHP_VERSION_ID < 80200) die('skip PHP >=8.2 only'); ?>
 --FILE--
 <?php
 error_reporting(E_ALL);

tests/php82_readonly_class.phpt

@@ -0,0 +1,27 @@
+--TEST--
+readonly class support in php 8.2+
+--SKIPIF--
+<?php if (PHP_VERSION_ID < 80200) die('skip PHP >=8.2 only'); ?>
+--FILE--
+<?php
+require __DIR__ . '/../util.php';
+
+$code = <<<'PHP'
+<?php
+readonly class X {}
+PHP;
+
+$node = ast\parse_code($code, $version=85);
+echo ast_dump($node), "\n";
+--EXPECTF--
+AST_STMT_LIST
+    0: AST_CLASS
+        flags: CLASS_READONLY (%d)
+        name: "X"
+        docComment: null
+        extends: null
+        implements: null
+        stmts: AST_STMT_LIST
+        attributes: null
+        type: null
+        __declId: 0