[#514] Isolate paginator count while preserving terminal count semantics

Author: armanist

src/Database/Adapters/Sleekdb/Statements/Result.php

@@ -128,11 +128,12 @@ public function first(): DbalInterface
      */
     public function count(): int
     {
-        $counter = clone $this;
-        $counter->queryBuilder = null;
-        $counter->builderPrepared = false;
-
-        return count($counter->fetchFilteredResultsFromBuilder($counter->getBuilder()));
+        try {
+            $results = $this->fetchFilteredResultsFromBuilder($this->getBuilder());
+            return count($results);
+        } finally {
+            $this->resetBuilderState();
+        }
     }
 
     /**

src/Paginator/Adapters/ModelPaginator.php

@@ -19,6 +19,7 @@
 use Quantum\Paginator\Contracts\PaginatorInterface;
 use Quantum\Paginator\Traits\PaginatorTrait;
 use Quantum\App\Exceptions\BaseException;
+use Quantum\Model\Exceptions\ModelException;
 use Quantum\Di\Exceptions\DiException;
 use Quantum\Model\ModelCollection;
 use Quantum\Model\DbModel;
@@ -38,15 +39,15 @@ class ModelPaginator implements PaginatorInterface
     private DbModel $model;
 
     /**
-     * @throws DiException|ReflectionException
+     * @throws DiException|ReflectionException|ModelException|BaseException
      */
     public function __construct(DbModel $model, int $perPage, int $page = 1)
     {
         $this->initialize($perPage, $page);
 
         $this->model = $model;
         $this->modelClass = $model->getModelName();
-        $this->total = $model->count();
+        $this->total = $this->getCountFromClonedModel($model);
     }
 
     /**
@@ -99,4 +100,17 @@ public function lastItem(): ?Model
 
         return $data->last();
     }
+
+    /**
+     * Counts results on an isolated model/ORM clone so total calculation cannot mutate
+     * the live model query state later used by paginator data().
+     * @throws ModelException|BaseException
+     */
+    private function getCountFromClonedModel(DbModel $model): int
+    {
+        $countModel = clone $model;
+        $countModel->setOrmInstance(clone $model->getOrmInstance());
+
+        return $countModel->count();
+    }
 }

tests/Unit/Database/Adapters/Sleekdb/Statements/ResultSleekTest.php

@@ -87,7 +87,7 @@ public function testSleekAsArray(): void
         $this->assertIsArray($user->asArray());
     }
 
-    public function testSleekCountDoesNotResetCriteriaState(): void
+    public function testSleekCountResetsCriteriaState(): void
     {
         $eventsModel = new SleekDbal('events');
 
@@ -99,8 +99,8 @@ public function testSleekCountDoesNotResetCriteriaState(): void
             ->orderBy('title', 'asc')
             ->get();
 
-        $this->assertCount(3, $events);
-        $this->assertEquals('Design', $events[0]->prop('title'));
+        $this->assertCount(7, $events);
+        $this->assertEquals('Art', $events[0]->prop('title'));
     }
 
     public function testSleekPaginateRetainsCriteriaAfterCount(): void