Skip to content
/ rector-src Public

[TypeDeclarationDocblocks] Use existing NodeDocblockTypeDecorator service on DocblockGetterReturnArrayFromPropertyDocblockVarRector #7387

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
samsonasik merged 1 commit into from
Oct 1, 2025
Merged

[TypeDeclarationDocblocks] Use existing NodeDocblockTypeDecorator service on DocblockGetterReturnArrayFromPropertyDocblockVarRector #7387

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: 9 additions & 17 deletions ...onDocblocks/Rector/ClassMethod/DocblockGetterReturnArrayFromPropertyDocblockVarRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
use PHPStan\Type\MixedType;
use PHPStan\Type\UnionType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
use Rector\Rector\AbstractRector;
use Rector\StaticTypeMapper\StaticTypeMapper;
use Rector\TypeDeclarationDocblocks\NodeDocblockTypeDecorator;
use Rector\TypeDeclarationDocblocks\TagNodeAnalyzer\UsefulArrayTagNodeAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand All @@ -26,9 +25,8 @@ final class DocblockGetterReturnArrayFromPropertyDocblockVarRector extends Abstr
{
public function __construct(
private readonly PhpDocInfoFactory $phpDocInfoFactory,
private readonly StaticTypeMapper $staticTypeMapper,
private readonly UsefulArrayTagNodeAnalyzer $usefulArrayTagNodeAnalyzer,
private readonly PhpDocTypeChanger $phpDocTypeChanger
private readonly NodeDocblockTypeDecorator $nodeDocblockTypeDecorator
) {
}

Expand Down Expand Up @@ -96,11 +94,6 @@ public function refactor(Node $node): ?Node
return null;
}

// // return tag is already given
// if ($phpDocInfo->getReturnTagValue() instanceof ReturnTagValueNode) {
// return null;
// }

$propertyFetch = $this->matchReturnLocalPropertyFetch($node);
if (! $propertyFetch instanceof PropertyFetch) {
return null;
Expand All @@ -118,14 +111,13 @@ public function refactor(Node $node): ?Node
return null;
}

$propertyFetchDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($propertyFetchType);

$this->phpDocTypeChanger->changeReturnTypeNode($node, $phpDocInfo, $propertyFetchDocTypeNode);

// $returnTagValueNode = new ReturnTagValueNode($propertyFetchDocTypeNode, '');
// $phpDocInfo->addTagValueNode($returnTagValueNode);
//
// $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
if (! $this->nodeDocblockTypeDecorator->decorateGenericIterableReturnType(
$propertyFetchType,
$phpDocInfo,
$node
)) {
return null;
}

return $node;
}
Expand Down