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
@@ -0,0 +1,33 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;

class BareArrayEmptyToMixed
{
/**
* @return array
*/
public function getRefreshTokenKeys()
{
return [];
}
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector\Fixture;

class BareArrayEmptyToMixed
{
/**
* @return mixed[]
*/
public function getRefreshTokenKeys()
{
return [];
}
}

?>
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
use PhpParser\Node\Stmt\Return_;
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\Type\Constant\ConstantArrayType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
use Rector\Rector\AbstractRector;
use Rector\TypeDeclarationDocblocks\NodeFinder\ReturnNodeFinder;
use Rector\TypeDeclarationDocblocks\TagNodeAnalyzer\UsefulArrayTagNodeAnalyzer;
Expand Down Expand Up @@ -114,6 +116,17 @@ public function refactor(Node $node): ?Node
return null;
}

// bare "@return array" with "return []" -> "mixed[]", better than "array{}"
if ($soleReturn->expr->items === [] && $this->hasBareArrayReturnTag($phpDocInfo)) {
$this->phpDocTypeChanger->changeReturnTypeNode(
$node,
$phpDocInfo,
new SpacingAwareArrayTypeNode(new IdentifierTypeNode('mixed'))
);

return $node;
}

// resolve simple type
$returnedType = $this->getType($soleReturn->expr);
if (! $returnedType instanceof ConstantArrayType) {
Expand Down Expand Up @@ -147,4 +160,14 @@ private function shouldSkipReturnMixedAndEmptyArray(PhpDocInfo $phpDocInfo, Arra
// better than array{}
return $returnTagValueNode->type instanceof ArrayTypeNode;
}

private function hasBareArrayReturnTag(PhpDocInfo $phpDocInfo): bool
{
$returnTagValueNode = $phpDocInfo->getReturnTagValue();
if (! $returnTagValueNode instanceof ReturnTagValueNode) {
return false;
}

return $returnTagValueNode->type instanceof IdentifierTypeNode && $returnTagValueNode->type->name === 'array';
}
}
Loading