Preserve doc comment on promoted property

Author: nikic

Zend/zend_ast.h

@@ -147,13 +147,13 @@ enum _zend_ast_kind {
 
 	ZEND_AST_TRY,
 	ZEND_AST_CATCH,
-	ZEND_AST_PARAM,
 	ZEND_AST_PROP_ELEM,
 	ZEND_AST_CONST_ELEM,
 
 	/* 4 child nodes */
 	ZEND_AST_FOR = 4 << ZEND_AST_NUM_CHILDREN_SHIFT,
 	ZEND_AST_FOREACH,
+	ZEND_AST_PARAM,
 };
 
 typedef uint16_t zend_ast_kind;

Zend/zend_compile.c

@@ -5758,6 +5758,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
 		zend_ast *type_ast = param_ast->child[0];
 		zend_ast *var_ast = param_ast->child[1];
 		zend_ast *default_ast = param_ast->child[2];
+		zend_ast *doc_comment_ast = param_ast->child[3];
 		zend_string *name = zval_make_interned_string(zend_ast_get_zval(var_ast));
 		zend_bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
 		zend_bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0;
@@ -5905,8 +5906,10 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
 				type = zend_compile_typename(type_ast, /* force_allow_null */ 0, /* use_arena */ 1);
 			}
 
+			zend_string *doc_comment =
+				doc_comment_ast ? zend_string_copy(zend_ast_get_str(doc_comment_ast)) : NULL;
 			zend_declare_typed_property(
-				scope, name, &default_value, visibility, /* doc_comment */ NULL, type);
+				scope, name, &default_value, visibility, doc_comment, type);
 		}
 	}
 

Zend/zend_language_parser.y

@@ -654,11 +654,13 @@ optional_visibility_modifier:
 
 parameter:
 		optional_visibility_modifier optional_type_without_static
-		is_reference is_variadic T_VARIABLE
-			{ $$ = zend_ast_create_ex(ZEND_AST_PARAM, $1 | $3 | $4, $2, $5, NULL); }
+		is_reference is_variadic T_VARIABLE backup_doc_comment
+			{ $$ = zend_ast_create_ex(ZEND_AST_PARAM, $1 | $3 | $4, $2, $5, NULL,
+					$6 ? zend_ast_create_zval_from_str($6) : NULL); }
 	|	optional_visibility_modifier optional_type_without_static
-		is_reference is_variadic T_VARIABLE '=' expr
-			{ $$ = zend_ast_create_ex(ZEND_AST_PARAM, $1 | $3 | $4, $2, $5, $7); }
+		is_reference is_variadic T_VARIABLE backup_doc_comment '=' expr
+			{ $$ = zend_ast_create_ex(ZEND_AST_PARAM, $1 | $3 | $4, $2, $5, $8,
+					$6 ? zend_ast_create_zval_from_str($6) : NULL); }
 ;
 
 

ext/reflection/tests/constructor_promotion.phpt

@@ -48,4 +48,4 @@ Class [ <user> class Test ] {
   }
 }
 
-bool(false)
+string(24) "/** @SomeAnnotation() */"