Skip to content
/ rector-src Public

[TypeDeclarationDocblocks] use empty array shape array{} for returns empty array on DocblockReturnArrayFromDirectArrayInstanceRector #7289

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 5 commits into from
Sep 15, 2025
Merged

[TypeDeclarationDocblocks] use empty array shape array{} for returns empty array on DocblockReturnArrayFromDirectArrayInstanceRector #7289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fb8989
[TypeDeclarationDocblocks] use empty array shape array{} for returns …
samsonasik Sep 15, 2025
2b1b0d9
move check on ConstantArrayTypeGeneralizer
samsonasik Sep 15, 2025
631bb3c
move check on ConstantArrayTypeGeneralizer
samsonasik Sep 15, 2025
e0d8046
move check on ConstantArrayTypeGeneralizer
samsonasik Sep 15, 2025
7ddd6e3
Fix phpstan
samsonasik Sep 15, 2025
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
2 changes: 1 addition & 1 deletion ...ClassMethod/DocblockReturnArrayFromDirectArrayInstanceRector/Fixture/return_empty.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockRetur
class ReturnEmpty
{
/**
* @return array<int, mixed>
* @return array{}
*/
public function run(): array
{
Expand Down
14 changes: 7 additions & 7 deletions rules/TypeDeclarationDocblocks/TypeResolver/ConstantArrayTypeGeneralizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Rector\TypeDeclarationDocblocks\TypeResolver;

use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\Type\Constant\ConstantArrayType;
use PHPStan\Type\IntegerType;
use PHPStan\Type\MixedType;
use PHPStan\Type\NeverType;
use PHPStan\Type\Type;
Expand All @@ -30,7 +30,7 @@ public function __construct(
) {
}

public function generalize(ConstantArrayType $constantArrayType, bool $isFresh = true): GenericTypeNode
public function generalize(ConstantArrayType $constantArrayType, bool $isFresh = true): GenericTypeNode|ArrayShapeNode
{
if ($isFresh) {
$this->currentNesting = 0;
Expand All @@ -40,12 +40,12 @@ public function generalize(ConstantArrayType $constantArrayType, bool $isFresh =

$genericKeyType = $this->typeNormalizer->generalizeConstantTypes($constantArrayType->getKeyType());

if ($constantArrayType->getItemType() instanceof NeverType) {
$genericKeyType = new IntegerType();
}

$itemType = $constantArrayType->getItemType();

if ($itemType instanceof NeverType) {
return ArrayShapeNode::createSealed([]);
}

if ($itemType instanceof ConstantArrayType) {
if ($this->currentNesting >= self::MAX_NESTING) {
$genericItemType = new MixedType();
Expand All @@ -64,7 +64,7 @@ public function generalize(ConstantArrayType $constantArrayType, bool $isFresh =
return $this->createArrayGenericTypeNode($genericKeyType, $genericItemType);
}

private function createArrayGenericTypeNode(Type $keyType, Type|GenericTypeNode $itemType): GenericTypeNode
private function createArrayGenericTypeNode(Type $keyType, Type|GenericTypeNode|ArrayShapeNode $itemType): GenericTypeNode
{
$keyDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($keyType);

Expand Down
Loading