Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
use PHPStan\PhpDocParser\Parser\PhpDocParser;
use PHPStan\PhpDocParser\Parser\TokenIterator;
use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwareParamTagValueNode;
use Rector\BetterPhpDocParser\Attributes\Ast\AttributeAwareNodeFactory;
use Rector\BetterPhpDocParser\Contract\NameAwarePhpDocNodeFactoryInterface;
use Rector\BetterPhpDocParser\Contract\PhpDocParserAwareInterface;
use Rector\BetterPhpDocParser\PhpDocParser\AnnotationContentResolver;
use Symplify\PackageBuilder\Reflection\PrivatesAccessor;
use Symplify\PackageBuilder\Reflection\PrivatesCaller;

Expand All @@ -35,10 +37,26 @@ final class ParamPhpDocNodeFactory implements NameAwarePhpDocNodeFactoryInterfac
*/
private $phpDocParser;

public function __construct(PrivatesAccessor $privatesAccessor, PrivatesCaller $privatesCaller)
{
/**
* @var AttributeAwareNodeFactory
*/
private $attributeAwareNodeFactory;

/**
* @var AnnotationContentResolver
*/
private $annotationContentResolver;

public function __construct(
PrivatesAccessor $privatesAccessor,
PrivatesCaller $privatesCaller,
AttributeAwareNodeFactory $attributeAwareNodeFactory,
AnnotationContentResolver $annotationContentResolver
) {
$this->privatesAccessor = $privatesAccessor;
$this->privatesCaller = $privatesCaller;
$this->attributeAwareNodeFactory = $attributeAwareNodeFactory;
$this->annotationContentResolver = $annotationContentResolver;
}

public function getName(): string
Expand Down Expand Up @@ -76,6 +94,9 @@ public function setPhpDocParser(PhpDocParser $phpDocParser): void
*/
private function parseParamTagValue(TokenIterator $tokenIterator): ParamTagValueNode
{
$originalTokenIterator = clone $tokenIterator;
$annotationContent = $this->annotationContentResolver->resolveFromTokenIterator($originalTokenIterator);

$typeParser = $this->privatesAccessor->getPrivateProperty($this->phpDocParser, 'typeParser');

$type = $typeParser->parse($tokenIterator);
Expand All @@ -96,6 +117,8 @@ private function parseParamTagValue(TokenIterator $tokenIterator): ParamTagValue
$tokenIterator
);

$type = $this->attributeAwareNodeFactory->createFromNode($type, $annotationContent);

return new AttributeAwareParamTagValueNode($type, $isVariadic, $parameterName, $description, $isReference);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ public function resolveFromTokenIterator(TokenIterator $tokenIterator): string
$tokenIterator->next();
}

// remove appended first space
// $annotationContent = ltrim($annotationContent);

return $this->cleanMultilineAnnotationContent($annotationContent);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/**
* @param (string|int) $cookies
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/**
* @param (string|\SomeClass)[] $cookies
*/