Skip to content

Commit 647220d

Browse files
committed
Restore @return docblocks now kept by fixed RemoveUselessUnionReturnDocblockRector
1 parent a888358 commit 647220d

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function resolveAnnotationMethodCall(BetterTokenIterator $tokenIterator,
5151
/**
5252
* @api tests
5353
* @see https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L1215-L1224
54+
* @return CurlyListNode|string|array<mixed>|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
5455
*/
5556
public function resolveAnnotationValue(
5657
BetterTokenIterator $tokenIterator,
@@ -119,6 +120,9 @@ private function resolveAnnotationValues(BetterTokenIterator $tokenIterator, Nod
119120
return $this->arrayParser->createArrayFromValues($values);
120121
}
121122

123+
/**
124+
* @return CurlyListNode|string|array<mixed>|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
125+
*/
122126
private function parseValue(
123127
BetterTokenIterator $tokenIterator,
124128
Node $currentPhpNode

src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function autowire(
3737
$this->arrayParser = $arrayParser;
3838
}
3939

40+
/**
41+
* @return string|mixed[]|ConstExprNode|DoctrineAnnotationTagValueNode|StringNode
42+
*/
4043
public function parseValue(
4144
BetterTokenIterator $tokenIterator,
4245
Node $currentPhpNode

src/PhpParser/Node/Value/ValueResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ private function resolveFileConstant(File $file): string
240240
return $file->getFilePath();
241241
}
242242

243+
/**
244+
* @return mixed[]|null
245+
*/
243246
private function extractConstantArrayTypeValue(ConstantArrayType $constantArrayType): ?array
244247
{
245248
$keys = [];

0 commit comments

Comments
 (0)