Fix #64: Fix yiisoft/data compatibility

yiisoft · Sep 12, 2024 · d84c005 · d84c005
1 parent dbb523e
commit d84c005
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/AbstractQueryDataReader.php b/src/AbstractQueryDataReader.php
@@ -27,7 +27,7 @@ abstract class AbstractQueryDataReader implements QueryDataReaderInterface
     private ?Sort $sort = null;
     private ?FilterInterface $filter = null;
     private ?FilterInterface $having = null;
-    private int $limit = 0;
+    private ?int $limit = null;
     private int $offset = 0;
 
     /**
@@ -163,7 +163,7 @@ public function withOffset(int $offset): static
      * @psalm-mutation-free
      * @psalm-return static<TKey, TValue>
      */
-    public function withLimit(int $limit): static
+    public function withLimit(?int $limit): static
     {
         if ($limit < 0) {
             throw new InvalidArgumentException('$limit must not be less than 0.');
@@ -210,7 +210,7 @@ public function withSort(?Sort $sort): static
      * @psalm-mutation-free
      * @psalm-return static<TKey, TValue>
      */
-    public function withFilter(FilterInterface $filter): static
+    public function withFilter(?FilterInterface $filter): static
     {
         $new = clone $this;
         $new->filter = $filter;
@@ -313,4 +313,19 @@ public function readOne(): array|object|null
      * @psalm-return TValue
      */
     abstract protected function createItem(array|object $row): array|object;
+
+    public function getFilter(): ?FilterInterface
+    {
+        return $this->filter;
+    }
+
+    public function getLimit(): ?int
+    {
+        return $this->limit;
+    }
+
+    public function getOffset(): int
+    {
+        return $this->offset;
+    }
 }
diff --git a/src/QueryDataReader.php b/src/QueryDataReader.php
@@ -4,6 +4,8 @@
 
 namespace Yiisoft\Data\Db;
 
+use Yiisoft\Data\Reader\FilterInterface;
+
 /**
  * Base class for `QueryDataReaderInterface`
  *