[TypeDeclaration] Skip possible returns false on ReturnTypeFromStrict…

…NewArrayRector (#5654) * [TypeDeclaration] Skip possible returns false on ReturnTypeFromStrictNewArrayRector * fix phstan
rectorphp · Feb 21, 2024 · 8038ee1 · 8038ee1
1 parent 6095e32
commit 8038ee1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/...lassMethod/ReturnTypeFromStrictNewArrayRector/Fixture/skip_possible_returns_false.php.inc b/...lassMethod/ReturnTypeFromStrictNewArrayRector/Fixture/skip_possible_returns_false.php.inc
@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNewArrayRector\Fixture;
+
+final class SkipPossibleReturnFalse
+{
+    public function couldUpdate(\stdClass $pricesItem, AbstractDocument $document)
+    {
+        $return = [];
+        $couldUpdate = false;
+
+        foreach ($document as $compareKey => $compareValue) {
+
+            $return[$compareKey] = [
+                $compareValue,
+                $pricesItem->$compareKey === null
+                    ? 'NULL'
+                    : (float) $pricesItem->$compareKey,
+            ];
+
+            $isSame = bccomp(
+                (string) ($pricesItem->$compareKey),
+                (string) ($compareValue),
+                2
+            );
+
+            if (!empty($isSame) && !$couldUpdate) {
+                $couldUpdate = true;
+            }
+        }
+
+        if ($couldUpdate) {
+            return $return;
+        }
+
+        return false;
+    }
+
+}
diff --git a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php
@@ -105,15 +105,15 @@ private function resolveClassStringInUnionType(UnionType $type): UnionType | Arr
             $keyType = $unionType->getKeyType();
             $itemType = $unionType->getItemType();
 
+            if (! $keyType instanceof MixedType && ! $keyType instanceof ConstantIntegerType) {
+                return $type;
+            }
+
             if ($itemType instanceof ArrayType) {
                 $arrayType = new ArrayType(new MixedType(), new MixedType());
                 return new ArrayType($keyType, $arrayType);
             }
 
-            if (! $keyType instanceof MixedType && ! $keyType instanceof ConstantIntegerType) {
-                return $type;
-            }
-
             if (! $itemType instanceof ClassStringType) {
                 return $type;
             }