Merge pull request #14 from samsonasik/check-string-key

[Finder] Fix string key on rows get when preserveKey disabled
samsonasik · Mar 6, 2024 · 79e3107 · 79e3107
2 parents 14cc25b + b6e8547
commit 79e3107
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Finder.php b/src/Finder.php
@@ -11,6 +11,7 @@
 
 use function current;
 use function end;
+use function is_string;
 use function iterator_to_array;
 use function key;
 use function prev;
@@ -137,8 +138,14 @@ public static function rows(iterable $data, callable $filter, bool $preserveKey
                 continue;
             }
 
-            $rows[$preserveKey ? $key : $newKey] = $datum;
-            ++$newKey;
+            if (is_string($key)) {
+                $rowKey = $key;
+            } else {
+                $rowKey = $preserveKey ? $key : $newKey;
+                ++$newKey;
+            }
+
+            $rows[$rowKey] = $datum;
         }
 
         return $rows;

diff --git a/tests/FinderTest.php b/tests/FinderTest.php
@@ -281,6 +281,11 @@ public static function rowsDataProvider(): array
                 static fn($datum): bool => $datum < 5,
                 [],
             ],
+            [
+                [6, 7, 'foo' => 8, 9],
+                static fn($datum): bool => $datum > 7,
+                ['foo' => 8, 9],
+            ],
         ];
     }