[TypeDeclarationDocblocks] Allow override dummy mixed[] SpacingAwareArrayTypeNode array on UsefulArrayTagNodeAnalyzer (#7396)

samsonasik · actions-user · web-flow · commit 66c32942ec7f · 2025-10-01T19:41:36.000+02:00
* [TypeDeclarationDocblocks] Allow override dummy mixed[] SpacingAwareArrayTypeNode array on UsefulArrayTagNodeAnalyzer * [ci-review] Rector Rectify * Revert "[ci-review] Rector Rectify" This reverts commit c7b1250. * skip publc method with mixed[] param on ClassMethodArrayDocblockParamFromLocalCallsRector * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector/Fixture/override_dummy_mixed_array.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/AddReturnDocblockDataProviderRector/Fixture/override_dummy_mixed_array.php.inc
@@ -0,0 +1,55 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class OverrideDummyMixedArray extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public static function provideData()
+    {
+        return [
+            [125, 35],
+            [1252]
+        ];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector\Fixture;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class OverrideDummyMixedArray extends TestCase
+{
+    #[DataProvider('provideData')]
+    public function testSomething()
+    {
+    }
+
+    /**
+     * @return int[][]
+     */
+    public static function provideData()
+    {
+        return [
+            [125, 35],
+            [1252]
+        ];
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/skip_override_dummy_array_mixed_on_public.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector/Fixture/skip_override_dummy_array_mixed_on_public.php.inc
@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector\Fixture;
+
+final class SkipOverrideDummyArrayMixedOnPublic
+{
+    public function go()
+    {
+        $this->run([2512, 3423]);
+
+        $this->run([324, 534]);
+    }
+
+    /**
+     * @param mixed[] $items
+     */
+    public function run(array $items)
+    {
+    }
+}
+
+?>
diff --git a/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php b/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\CodeQuality\Rector\If_;
 
+use PhpParser\Token;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Else_;
@@ -79,7 +80,7 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param mixed[] $oldTokens
+     * @param Token[] $oldTokens
      */
     private function isIfConditionFollowedByOpeningCurlyBracket(If_|ElseIf_|Else_ $if, array $oldTokens): bool
     {
diff --git a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php
@@ -147,7 +147,7 @@ public function refactor(Node $node): Concat|ClassConstFetch|null|int
     }
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/Php70/EregToPcreTransformer.php b/rules/Php70/EregToPcreTransformer.php
@@ -204,7 +204,7 @@ private function normalize(string $content, bool $normalizeUnprintableChar): str
     }
 
     /**
-     * @param mixed[] $r
+     * @param array<int, mixed> $r
      */
     private function processBracket(string $content, int $i, int $l, array &$r, int $rr): int
     {
@@ -284,7 +284,7 @@ private function _ere2pcre_escape(string $content): string
     }
 
     /**
-     * @param mixed[] $r
+     * @param array<int, mixed> $r
      */
     private function processCurlyBracket(string $s, int $i, array &$r, int $rr): int
     {
diff --git a/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php b/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
@@ -44,7 +44,7 @@ final class AddLiteralSeparatorToNumberRector extends AbstractRector implements
     private int $limitValue = self::DEFAULT_LIMIT_VALUE;
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php
@@ -93,7 +93,7 @@ public function refactor(Node $node): ?Enum_
     }
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php b/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php
@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php
@@ -121,7 +121,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/Strict/Rector/AbstractFalsyScalarRuleFixerRector.php b/rules/Strict/Rector/AbstractFalsyScalarRuleFixerRector.php
@@ -24,7 +24,7 @@ abstract class AbstractFalsyScalarRuleFixerRector extends AbstractRector impleme
     protected bool $treatAsNonEmpty = false;
 
     /**
-     * @param mixed[] $configuration
+     * @param array<string, mixed> $configuration
      */
     public function configure(array $configuration): void
     {
diff --git a/rules/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector.php b/rules/TypeDeclarationDocblocks/Rector/Class_/ClassMethodArrayDocblockParamFromLocalCallsRector.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
@@ -106,6 +107,13 @@ public function refactor(Node $node): ?Node
                     continue;
                 }
 
+                if ($parameterTagValueNode instanceof ParamTagValueNode
+                    && $classMethod->isPublic() &&
+                    $this->usefulArrayTagNodeAnalyzer->isMixedArray($parameterTagValueNode->type)) {
+                    // on public method, skip if there is mixed[], as caller can be anything
+                    continue;
+                }
+
                 $resolvedParameterType = $classMethodParameterTypes[$parameterPosition] ?? $classMethodParameterTypes[$parameterName] ?? null;
                 if (! $resolvedParameterType instanceof Type) {
                     continue;
diff --git a/rules/TypeDeclarationDocblocks/TagNodeAnalyzer/UsefulArrayTagNodeAnalyzer.php b/rules/TypeDeclarationDocblocks/TagNodeAnalyzer/UsefulArrayTagNodeAnalyzer.php
@@ -8,6 +8,8 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
 
 final class UsefulArrayTagNodeAnalyzer
 {
@@ -19,9 +21,14 @@ public function isUsefulArrayTag(null|ReturnTagValueNode|ParamTagValueNode|VarTa
 
         $type = $tagValueNode->type;
         if (! $type instanceof IdentifierTypeNode) {
-            return true;
+            return ! $this->isMixedArray($type);
         }
 
         return ! in_array($type->name, ['array', 'mixed'], true);
     }
+
+    public function isMixedArray(TypeNode $typeNode): bool
+    {
+        return $typeNode instanceof SpacingAwareArrayTypeNode && $typeNode->type instanceof IdentifierTypeNode && $typeNode->type->name === 'mixed';
+    }
 }
diff --git a/src/BetterPhpDocParser/Printer/RemoveNodesStartAndEndResolver.php b/src/BetterPhpDocParser/Printer/RemoveNodesStartAndEndResolver.php
@@ -13,7 +13,7 @@
 final class RemoveNodesStartAndEndResolver
 {
     /**
-     * @param mixed[] $tokens
+     * @param array<int, mixed> $tokens
      * @return StartAndEnd[]
      */
     public function resolve(PhpDocNode $originalPhpDocNode, PhpDocNode $currentPhpDocNode, array $tokens): array
diff --git a/src/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/CurlyListNode.php b/src/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/CurlyListNode.php
@@ -27,7 +27,7 @@ public function __toString(): string
     }
 
     /**
-     * @param mixed[] $array
+     * @param ArrayItemNode[] $array
      */
     private function implode(array $array): string
     {
diff --git a/src/Caching/ValueObject/CacheItem.php b/src/Caching/ValueObject/CacheItem.php
@@ -17,7 +17,7 @@ public function __construct(
     }
 
     /**
-     * @param mixed[] $properties
+     * @param array<string, mixed> $properties
      */
     public static function __set_state(array $properties): self
     {
diff --git a/src/ValueObject/Error/SystemError.php b/src/ValueObject/Error/SystemError.php
@@ -63,7 +63,7 @@ public function jsonSerialize(): array
     }
 
     /**
-     * @param mixed[] $json
+     * @param array<string, mixed> $json
      */
     public static function decode(array $json): self
     {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Rector\CodeQuality\Rector\If_;`
`6`	`6`
	`7`	`+use PhpParser\Token;`
`7`	`8`	`use PhpParser\Node;`
`8`	`9`	`use PhpParser\Node\Stmt;`
`9`	`10`	`use PhpParser\Node\Stmt\Else_;`
`@@ -79,7 +80,7 @@ public function refactor(Node $node): ?Node`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`/**`
`82`		`- * @param mixed[] $oldTokens`
	`83`	`+ * @param Token[] $oldTokens`
`83`	`84`	`*/`
`84`	`85`	`private function isIfConditionFollowedByOpeningCurlyBracket(If_\|ElseIf_\|Else_ $if, array $oldTokens): bool`
`85`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function refactor(Node $node): Concat\|ClassConstFetch\|null\|int`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`/**`
`150`		`- * @param mixed[] $configuration`
	`150`	`+ * @param array<string, mixed> $configuration`
`151`	`151`	`*/`
`152`	`152`	`public function configure(array $configuration): void`
`153`	`153`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private function normalize(string $content, bool $normalizeUnprintableChar): str`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`/**`
`207`		`- * @param mixed[] $r`
	`207`	`+ * @param array<int, mixed> $r`
`208`	`208`	`*/`
`209`	`209`	`private function processBracket(string $content, int $i, int $l, array &$r, int $rr): int`
`210`	`210`	`{`
`@@ -284,7 +284,7 @@ private function _ere2pcre_escape(string $content): string`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`/**`
`287`		`- * @param mixed[] $r`
	`287`	`+ * @param array<int, mixed> $r`
`288`	`288`	`*/`
`289`	`289`	`private function processCurlyBracket(string $s, int $i, array &$r, int $rr): int`
`290`	`290`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ final class AddLiteralSeparatorToNumberRector extends AbstractRector implements`
`44`	`44`	`private int $limitValue = self::DEFAULT_LIMIT_VALUE;`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @param mixed[] $configuration`
	`47`	`+ * @param array<string, mixed> $configuration`
`48`	`48`	`*/`
`49`	`49`	`public function configure(array $configuration): void`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function refactor(Node $node): ?Enum_`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/**`
`96`		`- * @param mixed[] $configuration`
	`96`	`+ * @param array<string, mixed> $configuration`
`97`	`97`	`*/`
`98`	`98`	`public function configure(array $configuration): void`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`		`- * @param mixed[] $configuration`
	`39`	`+ * @param array<string, mixed> $configuration`
`40`	`40`	`*/`
`41`	`41`	`public function configure(array $configuration): void`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function getNodeTypes(): array`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * @param mixed[] $configuration`
	`124`	`+ * @param array<string, mixed> $configuration`
`125`	`125`	`*/`
`126`	`126`	`public function configure(array $configuration): void`
`127`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ abstract class AbstractFalsyScalarRuleFixerRector extends AbstractRector impleme`
`24`	`24`	`protected bool $treatAsNonEmpty = false;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * @param mixed[] $configuration`
	`27`	`+ * @param array<string, mixed> $configuration`
`28`	`28`	`*/`
`29`	`29`	`public function configure(array $configuration): void`
`30`	`30`	`{`