fix(SimplifyListIndexRector): Refactor key handling logic

guanguans · guanguans · commit 8b9ec7571410 · 2025-04-04T20:27:21.000+08:00
- Improve logic for handling keys in array items
- Use collection methods more efficiently
- Handle null and non-integer keys correctly
- Ensure refactored logic maintains intended functionality and structure
diff --git a/composer.json b/composer.json
@@ -194,8 +194,8 @@
         "dump-soar-original-php-config": "Guanguans\\SoarPHP\\Support\\ComposerScripts::dumpSoarPHPConfig",
         "dump-soar-php-config": [
             "@dump-soar-original-php-config",
-            "@rector-soar-options",
-            "@style-fix"
+            "@rector-soar-options --no-diffs",
+            "@style-fix --quiet"
         ],
         "dump-soar-yaml-config": "Guanguans\\SoarPHP\\Support\\ComposerScripts::dumpSoarYamlConfig",
         "facade-lint": "@facade-update --lint",
diff --git a/phpstan.neon b/phpstan.neon
@@ -66,12 +66,12 @@ parameters:
             message: 'use config() instead'
     ignoreErrors:
         - identifier: argument.templateType
-#        - identifier: binaryOp.invalid
 #        - identifier: cast.string
 #        - identifier: method.nonObject
 #        - identifier: return.void
 #        - identifier: typePerfect.noMixedMethodCaller
         - identifier: argument.type
+        - identifier: binaryOp.invalid
         - identifier: encapsedStringPart.nonString
         - identifier: logicalAnd.resultUnused
         - identifier: missingType.generics
diff --git a/src/Support/Rectors/SimplifyListIndexRector.php b/src/Support/Rectors/SimplifyListIndexRector.php
@@ -13,8 +13,8 @@
 
 namespace Guanguans\SoarPHP\Support\Rectors;
 
+use Illuminate\Support\Collection;
 use PhpParser\Node;
-use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Scalar\Int_;
@@ -73,26 +73,30 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $keys = collect($node->items)->pluck('key');
+        $keys = collect($node->items)
+            ->pluck('key')
+            ->map(fn (?Expr $expr): mixed => $expr instanceof Expr ? $this->valueResolver->getValue($expr) : null);
 
+        /** @noinspection NullPointerExceptionInspection */
         if (
-            $keys
-                ->filter(static fn (?Expr $expr): bool => !$expr instanceof Int_)
-                ->isNotEmpty()
+            $keys->filter(static fn (mixed $key): bool => null !== $key && !\is_int($key))->isNotEmpty()
+            || !$this->isList(
+                $keys->reduce(
+                    static fn (Collection $carry, ?int $key): Collection => $carry->put(
+                        $key ?? ($carry->isEmpty() ? 0 : $carry->keys()->sortDesc(\SORT_NUMERIC)->first() + 1),
+                        $key
+                    ),
+                    collect()
+                )->all()
+            )
         ) {
             return null;
         }
 
-        $keyValues = $keys->mapWithKeys(fn (?Expr $expr): array => [
-            $key = $this->valueResolver->getValue($expr, true) => $key,
-        ]);
-
-        if ($keyValues->count() !== $keys->count() || !$this->isList($keyValues->all())) {
-            return null;
+        foreach ($node->items as $item) {
+            $item->key instanceof Int_ and $item->key = null;
         }
 
-        collect($node->items)->each(static fn (ArrayItem $arrayItem): mixed => $arrayItem->key = null);
-
         return $node;
     }
 
