Fix doc comments for properties with property hooks and add tests

Author: Christian Schneider

Zend/zend_language_parser.y

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

ext/reflection/tests/ReflectionParameter_getDocComment_property_hooks.phpt

@@ -0,0 +1,57 @@
+--TEST--
+Test ReflectionParameter::getDocComment() usage for property with hook.
+--INI--
+opcache.save_comments=1
+--FILE--
+<?php
+
+class A
+{
+     public function __construct(
+          /** $foo */
+          public string $foo {
+               /** getter */
+               get { return "foo"; }
+               /** setter */
+               set(string $value /** $value */) {}
+          }
+     ) {}
+}
+
+$rc = new ReflectionClass('A');
+$rp = $rc->getProperty('foo');
+echo "\n---> Doc comment for A::property $" . $rp->getName() . ":\n";
+var_dump($rp->getDocComment());
+
+$rh = $rp->getHook(PropertyHookType::Get);
+echo "\n---> Doc comment for A::property " . $rh->getName() . ":\n";
+var_dump($rh->getDocComment());
+
+$rh = $rp->getHook(PropertyHookType::Set);
+echo "\n---> Doc comment for A::property " . $rh->getName() . ":\n";
+var_dump($rh->getDocComment());
+
+$rp = $rh->getParameters()[0];
+echo "\n---> Doc comment for A::property \$foo::set parameter $" . $rp->getName() . ":\n";
+var_dump($rp->getDocComment());
+
+$rp = $rc->getConstructor()->getParameters()[0];
+echo "\n---> Doc comment for A::constructor parameter $" . $rp->getName() . ":\n";
+var_dump($rp->getDocComment());
+
+?>
+--EXPECTF--
+---> Doc comment for A::property $foo:
+string(%d) "/** $foo */"
+
+---> Doc comment for A::property $foo::get:
+string(%d) "/** getter */"
+
+---> Doc comment for A::property $foo::set:
+string(%d) "/** setter */"
+
+---> Doc comment for A::property $foo::set parameter $value:
+string(%d) "/** $value */"
+
+---> Doc comment for A::constructor parameter $foo:
+string(%d) "/** $foo */"