GH-17860: allow final in constructor property promotion

Author: DanielEScherzer

NEWS

@@ -17,6 +17,8 @@ PHP                                                                        NEWS
     `__callStatic` is allowed). (timwolla)
   . Fixed bug GH-17713 (ReflectionProperty::getRawValue() and related methods
     may call hooks of overridden properties). (Arnaud)
+  . Fixed bug GH-17860 (Final properties cannot use constructor property
+    promotion). (DanielEScherzer)
 
 - DOM:
   . Fixed bug GH-17609 (Typo in error message: Dom\NO_DEFAULT_NS instead of

Zend/tests/property_hooks/final_prop_promoted.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Promoted property may be marked final (hook)
+--FILE--
+<?php
+
+class A {
+    public function __construct(
+        public final $prop { get {} set {} }
+    ) {}
+}
+
+class B extends A {
+    public $prop { get {} set {} }
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot override final property A::$prop in %s on line %d

Zend/tests/property_hooks/final_prop_promoted_2.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Promoted property may be marked final (normal)
+--FILE--
+<?php
+
+class A {
+    public function __construct(
+        public final $prop
+    ) {}
+}
+
+class B extends A {
+    public $prop { get {} set {} }
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot override final property A::$prop in %s on line %d

Zend/tests/property_hooks/final_prop_promoted_ast.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Confirm that the AST indicates final promoted properties
+--FILE--
+<?php
+try {
+    assert(false && new class {
+        public function __construct( public final $prop ) {}
+    });
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+assert(false && new class {
+    public function __construct(public final $prop) {
+    }
+
+})

Zend/zend_ast.c

@@ -2555,6 +2555,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 				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->child[0]) {
 				zend_ast_export_type(str, ast->child[0], indent);
 				smart_str_appendc(str, ' ');

Zend/zend_compile.c

@@ -899,13 +899,7 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
 			}
 			break;
 		case T_FINAL:
-			if (target == ZEND_MODIFIER_TARGET_METHOD
-				|| target == ZEND_MODIFIER_TARGET_CONSTANT
-				|| target == ZEND_MODIFIER_TARGET_PROPERTY
-				|| target == ZEND_MODIFIER_TARGET_PROPERTY_HOOK) {
-				return ZEND_ACC_FINAL;
-			}
-			break;
+			return ZEND_ACC_FINAL;
 		case T_STATIC:
 			if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_METHOD) {
 				return ZEND_ACC_STATIC;
@@ -7598,7 +7592,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
 		zend_string *name = zval_make_interned_string(zend_ast_get_zval(var_ast));
 		bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
 		bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0;
-		uint32_t property_flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY);
+		uint32_t property_flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY | ZEND_ACC_FINAL);
 		bool is_promoted = property_flags || hooks_ast;
 
 		znode var_node, default_node;