Skip to content

Fix multiple annotation reading of same type at class method #3065

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

Merged
TomasVotruba merged 1 commit into from
Mar 25, 2020
Merged

Fix multiple annotation reading of same type at class method #3065

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
26 changes: 25 additions & 1 deletion packages/better-php-doc-parser/src/AnnotationReader/NodeAnnotationReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ final class NodeAnnotationReader
*/
private $nodeNameResolver;

/**
* @var string[]
*/
private $alreadyProvidedAnnotations = [];

public function __construct(Reader $reader, NodeNameResolver $nodeNameResolver)
{
$this->reader = $reader;
Expand All @@ -49,11 +54,30 @@ public function readMethodAnnotation(ClassMethod $classMethod, string $annotatio
$reflectionMethod = new ReflectionMethod($className, $methodName);

try {
return $this->reader->getMethodAnnotation($reflectionMethod, $annotationClassName);
// covers cases like https://github.com/rectorphp/rector/issues/3046

/** @var object[] $methodAnnotations */
$methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
foreach ($methodAnnotations as $methodAnnotation) {
if (! is_a($methodAnnotation, $annotationClassName, true)) {
continue;
}

$objectHash = md5(spl_object_hash($classMethod) . serialize($methodAnnotation));
if (in_array($objectHash, $this->alreadyProvidedAnnotations, true)) {
continue;
}

$this->alreadyProvidedAnnotations[] = $objectHash;

return $methodAnnotation;
}
} catch (AnnotationException $annotationException) {
// unable to laod
return null;
}

return null;
}

/**
Expand Down