fix: remove all array_is_list() checks (#104)

rekalogika · Jun 22, 2024 · 05d7b28 · 05d7b28
1 parent 57434df
commit 05d7b28
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.12.1
+
+* fix: remove all `array_is_list()` checks
+
 # 0.12.0
 
 * fix(`PagerItem`): `withPageNumber` should return static

diff --git a/packages/rekapager-doctrine-collections-adapter/src/SelectableAdapter.php b/packages/rekapager-doctrine-collections-adapter/src/SelectableAdapter.php
@@ -86,7 +86,7 @@ public function getOffsetItems(int $offset, int $limit): array
             // workaround: use indexBy
             $items = $this->collection->matching($criteria)->toArray();
 
-            if ($this->indexBy !== null && array_is_list($items)) {
+            if ($this->indexBy !== null) {
                 $newItems = [];
 
                 /** @var T $item */
@@ -296,7 +296,7 @@ public function getKeysetItems(
             // workaround: use indexBy
             $items = $this->collection->matching($criteria)->toArray();
 
-            if ($this->indexBy !== null && array_is_list($items)) {
+            if ($this->indexBy !== null) {
                 $newItems = [];
 
                 /** @var T $item */

diff --git a/packages/rekapager-keyset-pagination/src/Internal/KeysetPage.php b/packages/rekapager-keyset-pagination/src/Internal/KeysetPage.php
@@ -41,7 +41,6 @@ final class KeysetPage implements PageInterface, \IteratorAggregate
 
     private ?bool $hasPreviousPage = null;
     private ?bool $hasNextPage = null;
-    private ?bool $resultIsList = null;
 
     /**
      * @param KeysetPageable<TKey,T> $pageable
@@ -157,29 +156,6 @@ private function getRealResult(): array
             $this->hasNextPage = false;
         }
 
-        // determine if the result is a list
-
-        $this->resultIsList = true;
-        /** @var null|int */
-        $lastKey = null;
-        foreach ($result as $_ => $item) {
-            $key = $item->getKey();
-
-            if ($lastKey !== null) {
-                if (!\is_int($key) || !\is_int($lastKey)) {
-                    $this->resultIsList = false;
-                    break;
-                }
-
-                if ($key !== $lastKey + 1) {
-                    $this->resultIsList = false;
-                    break;
-                }
-            }
-
-            $lastKey = $key;
-        }
-
         return $result;
     }
 
@@ -421,10 +397,6 @@ public function getIterator(): \Traversable
             $results[$result->getKey()] = $result->getValue();
         }
 
-        if ($this->resultIsList) {
-            $results = array_values($results);
-        }
-
         /** @psalm-suppress InvalidReturnStatement */
         return new \ArrayIterator($results);
     }

diff --git a/packages/rekapager-pagerfanta-adapter/src/PagerfantaAdapterAdapter.php b/packages/rekapager-pagerfanta-adapter/src/PagerfantaAdapterAdapter.php
@@ -37,7 +37,7 @@ public function getOffsetItems(int $offset, int $limit): array
         /** @psalm-suppress InvalidArgument */
         $items = iterator_to_array($this->pagerfanta->getSlice($offset, $limit));
 
-        if ($this->indexBy !== null && array_is_list($items)) {
+        if ($this->indexBy !== null) {
             $newItems = [];
 
             /** @var T $item */