[php-src] master: Merge branch 'PHP-8.6'

From: Date: Wed, 11 Nov 2026 09:38:51 +0000
Subject: [php-src] master: Merge branch 'PHP-8.6'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-143572@lists.php.net to get a copy of this message
Author: Jorg Sowa (jorgsowa) Date: 2026-11-11T10:31:34+01:00 Commit: https://github.com/php/php-src/commit/9382b760836b13171f21deea20a4f347717688ba Raw diff: https://github.com/php/php-src/commit/9382b760836b13171f21deea20a4f347717688ba.diff Merge branch 'PHP-8.6' # Conflicts: # NEWS Changed paths: A ext/zend_test/tests/compile_to_ast/readonly_promoted.phpt M Zend/zend_ast.c Diff: diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 34d68f481028..411272e5a698 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -3124,6 +3124,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio 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, ' '); diff --git a/ext/zend_test/tests/compile_to_ast/readonly_promoted.phpt b/ext/zend_test/tests/compile_to_ast/readonly_promoted.phpt new file mode 100644 index 000000000000..c038ce47d21a --- /dev/null +++ b/ext/zend_test/tests/compile_to_ast/readonly_promoted.phpt @@ -0,0 +1,28 @@ +--TEST-- +AST can be recreated (readonly promoted constructor parameters) +--EXTENSIONS-- +zend_test +--FILE-- +<?php + +class Foo { + public function __construct( + public readonly int $publicReadonly, + readonly int $implicitlyPublicReadonly, + protected private(set) readonly array $asymmetricReadonly = [], + #[Attr] private readonly ?string $attributedReadonly = null, + public int $notReadonly = 1, + ) {} +} + +echo zend_test_compile_to_ast( file_get_contents( __FILE__ ) ); + +?> +--EXPECT-- +class Foo { + public function __construct(public readonly int $publicReadonly, readonly int $implicitlyPublicReadonly, protected private(set) readonly array $asymmetricReadonly = [], #[Attr] private readonly ?string $attributedReadonly = null, public int $notReadonly = 1) { + } + +} + +echo zend_test_compile_to_ast(file_get_contents(__FILE__));

« previous php.cvs (#143572) next »