Skip to content

zend_language_parser: Backup / restore doc comment when parsing attributes #20896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TimWolla wants to merge 1 commit into
base: PHP-8.5
Choose a base branch
from
+109 −1
Open

zend_language_parser: Backup / restore doc comment when parsing attributes #20896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend_language_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ attribute_group:
;

attribute:
T_ATTRIBUTE attribute_group possible_comma ']' { $$ = $2; }
T_ATTRIBUTE backup_doc_comment attribute_group possible_comma ']' { $$ = $3; CG(doc_comment) = $2; }
;

attributes:
Expand Down
108 changes: 108 additions & 0 deletions ext/reflection/tests/gh20895.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
--TEST--
GH-20895: ReflectionProperty does not return the PHPDoc of a property if it contains an attribute with a Closure
--FILE--
<?php

/** Foo */
#[Attr(
/** Closure 1 */
static function() { },
/** Closure 2 */
static function() { },
)]
class Foo {
/** Foo::$bar */
#[Attr(
/** Closure 3 */
static function() { },
/** Closure 4 */
static function() { },
)]
#[Attr(
/** Closure 5 */
static function() { },
)]
public $bar;

/** Foo::bar() */
#[Attr(
/** Closure 6 */
static function() { },
)]
public function bar() { }
}

/** foo() */
#[Attr(
/** Closure 7 */
static function() { },
)]
function foo() { }

#[Attr(
/** Closure 8 */
static function() { },
)]
/** bar() */
function bar() { }

/** baz() */
#[Attr(
static function() { },
)]
function baz() { }

var_dump((new ReflectionClass(Foo::class))->getDocComment());
foreach ((new ReflectionClass(Foo::class))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}
var_dump((new ReflectionProperty(Foo::class, 'bar'))->getDocComment());
foreach ((new ReflectionProperty(Foo::class, 'bar'))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}
var_dump((new ReflectionMethod(Foo::class, 'bar'))->getDocComment());
foreach ((new ReflectionMethod(Foo::class, 'bar'))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}
var_dump((new ReflectionFunction('foo'))->getDocComment());
foreach ((new ReflectionFunction('foo'))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}
var_dump((new ReflectionFunction('bar'))->getDocComment());
foreach ((new ReflectionFunction('bar'))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}
var_dump((new ReflectionFunction('baz'))->getDocComment());
foreach ((new ReflectionFunction('baz'))->getAttributes() as $attribute) {
foreach ($attribute->getArguments() as $argument) {
var_dump((new ReflectionFunction($argument))->getDocComment());
}
}

?>
--EXPECT--
string(10) "/** Foo */"
string(16) "/** Closure 1 */"
string(16) "/** Closure 2 */"
string(16) "/** Foo::$bar */"
string(16) "/** Closure 3 */"
string(16) "/** Closure 4 */"
string(16) "/** Closure 5 */"
string(17) "/** Foo::bar() */"
string(16) "/** Closure 6 */"
string(12) "/** foo() */"
string(16) "/** Closure 7 */"
string(12) "/** bar() */"
string(16) "/** Closure 8 */"
string(12) "/** baz() */"
bool(false)
Loading