[PHP 74] Fix ArraySpreadInsteadOfArrayMergeRector for non-constant string keys

packages/php-74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php

@@ -11,8 +11,11 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Expr\Variable;
+use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\RectorDefinition\CodeSample;
 use Rector\Core\RectorDefinition\RectorDefinition;
@@ -127,16 +130,11 @@ private function shouldSkipArrayForInvalidTypeOrKeys(Expr $expr): bool
         }
 
         $arrayStaticType = $this->getStaticType($expr);
-        if ($arrayStaticType instanceof ConstantArrayType) {
-            foreach ($arrayStaticType->getKeyTypes() as $keyType) {
-                // key cannot be string
-                if ($keyType instanceof ConstantStringType) {
-                    return true;
-                }
-            }
+        if ($this->isConstantArrayTypeWithStringKeyType($arrayStaticType)) {
+            return true;
         }
 
-        return false;
+        return $arrayStaticType instanceof ArrayType && $arrayStaticType->getKeyType() instanceof StringType;
     }
 
     private function resolveValue(Expr $expr): Expr
@@ -174,4 +172,20 @@ private function isIteratorToArrayFuncCall(Expr $expr): bool
     {
         return $expr instanceof FuncCall && $this->isName($expr, 'iterator_to_array');
     }
+
+    private function isConstantArrayTypeWithStringKeyType(Type $type): bool
+    {
+        if (! $type instanceof ConstantArrayType) {
+            return false;
+        }
+
+        foreach ($type->getKeyTypes() as $keyType) {
+            // key cannot be string
+            if ($keyType instanceof ConstantStringType) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

packages/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_parse_url.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Php74\Tests\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\Fixture;
+
+class SkipParseUrl
+{
+    public function run()
+    {
+        return array_merge($this->parseUrl($url), $this->parseUrl($redirectLocation));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function parseUrl(string $url): array
+    {
+        $urlParts = parse_url($url);
+
+        return array_filter($urlParts);
+    }
+}