Commit 24934c98adf for php

commit 24934c98adf640ab8e4f25f5c7acb075f5ccda6b
Merge: 764ab599a2e 8a8f4752a3b
Author: Jorg Sowa <jorg.sowa@gmail.com>
Date:   Wed Nov 11 10:31:11 2026 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    # Conflicts:
    #       Zend/zend_ast.c

diff --cc Zend/zend_ast.c
index e48ec13e98d,0f20becf045..26da17b8a5b
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@@ -2882,9 -2627,9 +2882,12 @@@ simple_list
  				zend_ast_export_attributes(str, ast->child[3], indent, 0);
  			}
  			zend_ast_export_visibility(str, ast->attr, ZEND_MODIFIER_TARGET_CPP);
 +			if (ast->attr & ZEND_ACC_FINAL) {
 +				smart_str_appends(str, "final ");
 +			}
+ 			if (ast->attr & ZEND_ACC_READONLY) {
+ 				smart_str_appends(str, "readonly ");
+ 			}
  			if (ast->child[0]) {
  				zend_ast_export_type(str, ast->child[0], indent);
  				smart_str_appendc(str, ' ');