[TypeDeclaration] Skip possibly both clear + unclear type used on AddParamFromDimFetchKeyUseRector

rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamFromDimFetchKeyUseRector/Fixture/skip_mix_clear_and_unclear_type.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamFromDimFetchKeyUseRector\Fixture;
+
+final class SkipMixClearAndUnClearType
+{
+    public function process($key, $unclearType)
+    {
+        if (rand(0, 1)) {
+            $items = [
+                'first' => 'Firstitem',
+                'second' => 'Seconditem',
+            ];
+
+            return $items[$key];
+        }
+
+        return $unclearType[$key];
+    }
+}

rules/TypeDeclaration/NodeAnalyzer/VariableInSprintfMaskMatcher.php

@@ -31,9 +31,7 @@ public function __construct(
     public function matchMask(ClassMethod|Function_ $functionLike, string $variableName, string $mask): bool
     {
         $funcCalls = $this->betterNodeFinder->findInstancesOfScoped((array) $functionLike->stmts, FuncCall::class);
-        $funcCalls = array_values(array_filter($funcCalls, function (FuncCall $funcCall): bool {
-            return $this->nodeNameResolver->isName($funcCall->name, 'sprintf');
-        }));
+        $funcCalls = array_values(array_filter($funcCalls, fn(FuncCall $funcCall): bool => $this->nodeNameResolver->isName($funcCall->name, 'sprintf')));
 
         if (count($funcCalls) !== 1) {
             return false;

rules/TypeDeclaration/Rector/ClassMethod/AddParamFromDimFetchKeyUseRector.php

@@ -112,28 +112,28 @@ public function refactor(Node $node): ?Node
                     $dimFetchType = $this->getType($dimFetch->var);
 
                     if (! $dimFetchType instanceof ArrayType && ! $dimFetchType instanceof ConstantArrayType) {
-                        continue;
+                        continue 2;
                     }
 
                     if ($dimFetch->dim instanceof Variable) {
                         $type = $this->nodeTypeResolver->getType($dimFetch->dim);
                         if ($type instanceof UnionType) {
-                            continue;
+                            continue 2;
                         }
                     }
+                }
 
-                    $paramTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode(
-                        $dimFetchType->getKeyType(),
-                        TypeKind::PARAM
-                    );
-
-                    if (! $paramTypeNode instanceof Node) {
-                        continue;
-                    }
+                $paramTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode(
+                    $dimFetchType->getKeyType(),
+                    TypeKind::PARAM
+                );
 
-                    $param->type = $paramTypeNode;
-                    $hasChanged = true;
+                if (! $paramTypeNode instanceof Node) {
+                    continue;
                 }
+
+                $param->type = $paramTypeNode;
+                $hasChanged = true;
             }
         }