Skip to content
/ rector-src Public

[TypeDeclarationDocblocks] Use int key on inner array over mixed key on DocblockVarArrayFromPropertyDefaultsRector #7374

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 3 commits into from
Sep 30, 2025
Merged

[TypeDeclarationDocblocks] Use int key on inner array over mixed key on DocblockVarArrayFromPropertyDefaultsRector #7374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
850807e
[TypeDeclarationDocblocks] Use int key on inner array over mixed key …
samsonasik Sep 30, 2025
e504202
Fix
samsonasik Sep 30, 2025
4b36054
use increment
samsonasik Sep 30, 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
38 changes: 38 additions & 0 deletions ...s/Rector/Class_/DocblockVarArrayFromPropertyDefaultsRector/Fixture/int_key_inside.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\DocblockVarArrayFromPropertyDefaultsRector\Fixture;

final class IntKeyInside
{
private array $array = [
'a' => [
'b' => [
['c' => 'e', 'f' => 1],
['d' => 2],
],
],
];
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\DocblockVarArrayFromPropertyDefaultsRector\Fixture;

final class IntKeyInside
{
/**
* @var array<string, array<string, array<int, array<string, string|int>>>>
*/
private array $array = [
'a' => [
'b' => [
['c' => 'e', 'f' => 1],
['d' => 2],
],
],
];
}

?>
6 changes: 4 additions & 2 deletions rules/Privatization/TypeManipulator/TypeNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ public function generalizeConstantBoolTypes(Type $type): Type
*/
public function generalizeConstantTypes(Type $type): Type
{
return TypeTraverser::map($type, function (Type $type, callable $traverseCallback): Type {
$deep = 0;
return TypeTraverser::map($type, function (Type $type, callable $traverseCallback) use (&$deep): Type {
++$deep;
if ($type instanceof AccessoryNonFalsyStringType || $type instanceof AccessoryLiteralStringType || $type instanceof AccessoryNonEmptyStringType) {
return new StringType();
}
Expand All @@ -81,7 +83,7 @@ public function generalizeConstantTypes(Type $type): Type
if ($type instanceof ConstantArrayType) {
// is relevant int constantArrayType?
if ($this->isImplicitNumberedListKeyType($type)) {
$keyType = new MixedType();
$keyType = $deep === 1 ? new MixedType() : new IntegerType();
} else {
$keyType = $this->generalizeConstantTypes($type->getKeyType());
}
Expand Down