Simplify impossible cases

src/Paginator/KeysetPaginator.php

@@ -257,15 +257,11 @@ public function getNextToken(): ?PageToken
 
     public function isSortable(): bool
     {
-        return !($this->dataReader instanceof LimitableDataInterface && $this->dataReader->getLimit() !== null);
+        return true;
     }
 
     public function withSort(?Sort $sort): static
     {
-        if (!$this->isSortable()) {
-            throw new InvalidArgumentException('Data reader does not support sorting.');
-        }
-
         $new = clone $this;
         $new->dataReader = $this->dataReader->withSort($sort);
         return $new;

src/Paginator/OffsetPaginator.php

@@ -6,7 +6,6 @@
 
 use Generator;
 use InvalidArgumentException;
-use LogicException;
 use Yiisoft\Data\Reader\CountableDataInterface;
 use Yiisoft\Data\Reader\FilterableDataInterface;
 use Yiisoft\Data\Reader\FilterInterface;
@@ -253,7 +252,7 @@ public function isFilterable(): bool
     public function withFilter(FilterInterface $filter): static
     {
         if (!$this->isFilterable()) {
-            throw new LogicException('Data reader does not support filtering.');
+            throw new InvalidArgumentException('Data reader does not support filtering.');
         }
 
         $new = clone $this;

tests/Paginator/KeysetPaginatorTest.php

@@ -6,12 +6,14 @@
 
 use ArrayIterator;
 use InvalidArgumentException;
+use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use RuntimeException;
 use stdClass;
 use Yiisoft\Arrays\ArrayHelper;
 use Yiisoft\Data\Paginator\KeysetFilterContext;
 use Yiisoft\Data\Paginator\KeysetPaginator;
+use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\Data\Paginator\PageToken;
 use Yiisoft\Data\Reader\Filter\Equals;
 use Yiisoft\Data\Reader\Filter\GreaterThan;
@@ -27,6 +29,8 @@
 use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Data\Reader\SortableDataInterface;
 use Yiisoft\Data\Tests\Support\MutationDataReader;
+use Yiisoft\Data\Tests\Support\StubKeysetData;
+use Yiisoft\Data\Tests\Support\StubOffsetData;
 use Yiisoft\Data\Tests\TestCase;
 
 use function array_values;

tests/Paginator/OffsetPaginatorTest.php

@@ -5,7 +5,6 @@
 namespace Yiisoft\Data\Tests\Paginator;
 
 use InvalidArgumentException;
-use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\Data\Paginator\PageNotFoundException;
@@ -561,7 +560,7 @@ public function testWithSortNonSortableData(): void
     {
         $paginator = new OffsetPaginator(new StubOffsetData());
 
-        $this->expectException(LogicException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Data reader does not support sorting.');
         $paginator->withSort(null);
     }
@@ -600,7 +599,7 @@ public function testWithFilterNonFilterableData(): void
     {
         $paginator = new OffsetPaginator(new StubOffsetData());
 
-        $this->expectException(LogicException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Data reader does not support filtering.');
         $paginator->withFilter(new Equals('id', 2));
     }

tests/Support/StubKeysetData.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Tests\Support;
+
+use Yiisoft\Data\Reader\CountableDataInterface;
+use Yiisoft\Data\Reader\FilterableDataInterface;
+use Yiisoft\Data\Reader\FilterHandlerInterface;
+use Yiisoft\Data\Reader\FilterInterface;
+use Yiisoft\Data\Reader\LimitableDataInterface;
+use Yiisoft\Data\Reader\ReadableDataInterface;
+use Yiisoft\Data\Reader\Sort;
+use Yiisoft\Data\Reader\SortableDataInterface;
+
+final class StubKeysetData implements
+    ReadableDataInterface,
+    CountableDataInterface,
+    LimitableDataInterface,
+    FilterableDataInterface,
+    SortableDataInterface
+{
+    /**
+     * @var int|null
+     * @psalm-param null|non-negative-int
+     */
+    private ?int $limit = null;
+
+    public function read(): iterable
+    {
+        return [];
+    }
+
+    public function readOne(): array|object|null
+    {
+        return null;
+    }
+
+    public function count(): int
+    {
+        return 0;
+    }
+
+    public function withLimit(?int $limit): static
+    {
+        $new = clone $this;
+        $new->limit = $limit;
+        return $new;
+    }
+
+    public function getLimit(): ?int
+    {
+        return $this->limit;
+    }
+
+    public function withFilter(?FilterInterface $filter): static
+    {
+        return clone $this;
+    }
+
+    public function getFilter(): ?FilterInterface
+    {
+        return null;
+    }
+
+    public function withAddedFilterHandlers(FilterHandlerInterface ...$filterHandlers): static
+    {
+        return clone $this;
+    }
+
+    public function withSort(?Sort $sort): static
+    {
+        return clone $this;
+    }
+
+    public function getSort(): ?Sort
+    {
+        return Sort::only(['id'])->withOrderString('id');
+    }
+}

tests/Support/StubOffsetData.php

@@ -40,7 +40,7 @@ public function withOffset(int $offset): static
         return $this;
     }
 
-    public function getLimit(): int
+    public function getLimit(): ?int
     {
         return 0;
     }