diff --git a/src/Reader/EntityReader.php b/src/Reader/EntityReader.php
index afcc0d5..b477083 100644
--- a/src/Reader/EntityReader.php
+++ b/src/Reader/EntityReader.php
@@ -12,7 +12,6 @@
 use InvalidArgumentException;
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler\LikeHandlerFactory;
-use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\DataReaderInterface;
 use Yiisoft\Data\Reader\Filter\All;
 use Yiisoft\Data\Reader\Iterable\Context;
@@ -57,9 +56,9 @@ final class EntityReader implements DataReaderInterface
     private CachedCount $countCache;
     private CachedCollection $itemsCache;
     private CachedCollection $oneItemCache;
-    
+
     private array $filterHandlers;
-    
+
     /**
      * @param Select|SelectQuery $query
      * @param ValueReaderInterface $valueReader
@@ -69,8 +68,7 @@ public function __construct(
         Select|SelectQuery $query,
         ValueReaderInterface $valueReader = new FlatValueReader(),
         array $extraFilterHandlers = [],
-    )
-    {
+    ) {
         $this->query = clone $query;
         $this->countCache = new CachedCount($this->query);
         $this->itemsCache = new CachedCollection();
diff --git a/src/Reader/FilterHandler/AllHandler.php b/src/Reader/FilterHandler/AllHandler.php
index 7b3004b..7eb0aab 100644
--- a/src/Reader/FilterHandler/AllHandler.php
+++ b/src/Reader/FilterHandler/AllHandler.php
@@ -23,7 +23,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
     {
         return [];
     }
-    
+
     #[\Override]
     public function match(object|array $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/src/Reader/FilterHandler/AndXHandler.php b/src/Reader/FilterHandler/AndXHandler.php
index 5728272..2a6ca6f 100644
--- a/src/Reader/FilterHandler/AndXHandler.php
+++ b/src/Reader/FilterHandler/AndXHandler.php
@@ -40,7 +40,7 @@ static function (QueryBuilder $select) use ($filter, $handlers) {
             },
         ];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/src/Reader/FilterHandler/BetweenHandler.php b/src/Reader/FilterHandler/BetweenHandler.php
index e071102..8c78420 100644
--- a/src/Reader/FilterHandler/BetweenHandler.php
+++ b/src/Reader/FilterHandler/BetweenHandler.php
@@ -25,13 +25,13 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, 'between', $filter->minValue, $filter->maxValue];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
         /**
          * @var Between $filter
-         * @var int|string|float|null $value
+         * @var float|int|string|null $value
          */
         $value = $context->readValue($item, $filter->field);
         $min = $filter->minValue;
diff --git a/src/Reader/FilterHandler/EqualsHandler.php b/src/Reader/FilterHandler/EqualsHandler.php
index 92b722c..7cdc2ea 100644
--- a/src/Reader/FilterHandler/EqualsHandler.php
+++ b/src/Reader/FilterHandler/EqualsHandler.php
@@ -25,13 +25,13 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '=', $filter->value];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
         /**
          *  @var Equals $filter
-         *  @var int|string|float|null $itemValue 
+         *  @var float|int|string|null $itemValue
          */
 
         $itemValue = $context->readValue($item, $filter->field);
diff --git a/src/Reader/FilterHandler/EqualsNullHandler.php b/src/Reader/FilterHandler/EqualsNullHandler.php
index bcbcf5f..1a6b26c 100644
--- a/src/Reader/FilterHandler/EqualsNullHandler.php
+++ b/src/Reader/FilterHandler/EqualsNullHandler.php
@@ -25,13 +25,13 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '=', null];
     }
-    
+
     #[\Override]
     public function match(object|array $item, FilterInterface $filter, Context $context): bool
     {
-        /** 
+        /**
          * @var EqualsNull $filter
-         * @var int|string|float|null $context->readValue($item, $filter->field) 
+         * @var float|int|string|null $context->readValue($item, $filter->field)
          */
 
         return $context->readValue($item, $filter->field) === null;
diff --git a/src/Reader/FilterHandler/GreaterThanHandler.php b/src/Reader/FilterHandler/GreaterThanHandler.php
index 6479f16..3b83204 100644
--- a/src/Reader/FilterHandler/GreaterThanHandler.php
+++ b/src/Reader/FilterHandler/GreaterThanHandler.php
@@ -25,13 +25,13 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '>', $filter->value];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
         /**
          * @var GreaterThan $filter
-         * @var int|string|float|null $itemValue
+         * @var float|int|string|null $itemValue
          */
 
         $itemValue = $context->readValue($item, $filter->field);
diff --git a/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php b/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php
index 473563a..1507e8a 100644
--- a/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php
+++ b/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php
@@ -25,13 +25,13 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '>=', $filter->value];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
         /**
          * @var GreaterThanOrEqual $filter
-         * @var int|string|float|null $itemValue
+         * @var float|int|string|null $itemValue
          */
         $itemValue = $context->readValue($item, $filter->field);
         $argumentValue = $filter->value;
diff --git a/src/Reader/FilterHandler/InHandler.php b/src/Reader/FilterHandler/InHandler.php
index c403f4f..a93d7f7 100644
--- a/src/Reader/FilterHandler/InHandler.php
+++ b/src/Reader/FilterHandler/InHandler.php
@@ -26,7 +26,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, 'in', new Parameter($filter->values)];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/src/Reader/FilterHandler/LessThanHandler.php b/src/Reader/FilterHandler/LessThanHandler.php
index 61b6f69..2fc9bbe 100644
--- a/src/Reader/FilterHandler/LessThanHandler.php
+++ b/src/Reader/FilterHandler/LessThanHandler.php
@@ -25,15 +25,15 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '<', $filter->value];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
-     {
+    {
         /**
          * @var LessThan $filter
-         *  @var int|string|float|null $itemValue
+         *  @var float|int|string|null $itemValue
          */
-        
+
         $itemValue = $context->readValue($item, $filter->field);
         $argumentValue = $filter->value;
 
@@ -44,4 +44,3 @@ public function match(array|object $item, FilterInterface $filter, Context $cont
         return $itemValue < $argumentValue;
     }
 }
-
diff --git a/src/Reader/FilterHandler/LessThanOrEqualHandler.php b/src/Reader/FilterHandler/LessThanOrEqualHandler.php
index 7e046c1..f46a758 100644
--- a/src/Reader/FilterHandler/LessThanOrEqualHandler.php
+++ b/src/Reader/FilterHandler/LessThanOrEqualHandler.php
@@ -25,14 +25,14 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         return [$filter->field, '<=', $filter->value];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
-         /**
-          * @var LessThanOrEqual $filter
-          * @var int|string|float|null $itemValue
-          */
+        /**
+         * @var LessThanOrEqual $filter
+         * @var float|int|string|null $itemValue
+         */
 
         $itemValue = $context->readValue($item, $filter->field);
         $argumentValue = $filter->value;
@@ -41,6 +41,6 @@ public function match(array|object $item, FilterInterface $filter, Context $cont
             return false;
         }
 
-        return $itemValue <= $argumentValue;        
+        return $itemValue <= $argumentValue;
     }
 }
diff --git a/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php
index 2f7b229..fab7365 100644
--- a/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php
+++ b/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php
@@ -39,7 +39,7 @@ protected function prepareValue(string|\Stringable $value, LikeMode $mode = Like
             LikeMode::EndsWith => '%' . $escapedValue,
         };
     }
-    
+
     #[\Override]
     public function match(object|array $item, FilterInterface $filter, Context $context): bool
     {
@@ -54,7 +54,7 @@ public function match(object|array $item, FilterInterface $filter, Context $cont
         if ($searchValue === '') {
             return true;
         }
-        
+
         /**
          * @var string $searchValue
          */
@@ -87,4 +87,4 @@ private function matchEndsWith(string $value, string $search, ?bool $caseSensiti
 
         return mb_strtolower(mb_substr($value, -mb_strlen($search))) === mb_strtolower($search);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php
index b0c0628..5d793d2 100644
--- a/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php
+++ b/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php
@@ -15,7 +15,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
     {
         /**
          * @var Like $filter
-         * @var string $filter->value 
+         * @var string $filter->value
          */
         $pattern = $this->prepareValue($filter->value, $filter->mode);
 
diff --git a/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php
index b12fbf6..6904369 100644
--- a/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php
+++ b/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php
@@ -15,7 +15,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
     {
         /**
          * @var Like $filter
-         * @var string $filter->value 
+         * @var string $filter->value
          */
         $pattern = $this->prepareValue($filter->value, $filter->mode);
 
diff --git a/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php
index fcd73c6..8991557 100644
--- a/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php
+++ b/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php
@@ -19,9 +19,9 @@ public function __construct()
     #[\Override]
     public function getAsWhereArguments(FilterInterface $filter, array $handlers): array
     {
-        /** 
-         * @var Like $filter         
-         * @var string $filter->value   
+        /**
+         * @var Like $filter
+         * @var string $filter->value
          */
         $pattern = $this->prepareValue($filter->value, $filter->mode);
 
diff --git a/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php
index 01530e6..825adf8 100644
--- a/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php
+++ b/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php
@@ -39,7 +39,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
         // The above escaping replacements will be used to build the pattern
         // in the event of escape characters (% or _) being found in the $filter->value
         // Sqlite does not have the ESCAPE command available
-        
+
         /** @var string $filter->value */
         $pattern = $this->prepareValue($filter->value, $filter->mode);
 
diff --git a/src/Reader/FilterHandler/NoneHandler.php b/src/Reader/FilterHandler/NoneHandler.php
index 2ad5aec..a1afaaa 100644
--- a/src/Reader/FilterHandler/NoneHandler.php
+++ b/src/Reader/FilterHandler/NoneHandler.php
@@ -24,7 +24,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
     {
         return [new Expression('1 = 0')];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/src/Reader/FilterHandler/NotHandler.php b/src/Reader/FilterHandler/NotHandler.php
index d4a695c..a732161 100644
--- a/src/Reader/FilterHandler/NotHandler.php
+++ b/src/Reader/FilterHandler/NotHandler.php
@@ -37,7 +37,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
 
         $convertedFilter = $this->convertFilter($filter->filter);
         $handledFilter = $convertedFilter instanceof Not ? $convertedFilter->filter : $convertedFilter;
-        
+
         /** @var QueryBuilderFilterHandler|null $handler */
         $handler = $handlers[$handledFilter::class] ?? null;
         if ($handler === null) {
@@ -105,7 +105,7 @@ private function convertNot(Not $filter, int $notCount): FilterInterface
 
         return $notCount % 2 === 1 ? new Not($filter->filter) : $filter->filter;
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/src/Reader/FilterHandler/OrXHandler.php b/src/Reader/FilterHandler/OrXHandler.php
index 164c0f5..be812a0 100644
--- a/src/Reader/FilterHandler/OrXHandler.php
+++ b/src/Reader/FilterHandler/OrXHandler.php
@@ -38,7 +38,7 @@ static function (QueryBuilder $select) use ($filter, $handlers) {
             },
         ];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/tests/Feature/Base/Reader/BaseEntityReaderTestCase.php b/tests/Feature/Base/Reader/BaseEntityReaderTestCase.php
index 21b188b..9e0fe83 100644
--- a/tests/Feature/Base/Reader/BaseEntityReaderTestCase.php
+++ b/tests/Feature/Base/Reader/BaseEntityReaderTestCase.php
@@ -6,7 +6,6 @@
 
 use Cycle\Database\Query\SelectQuery;
 use Cycle\ORM\Select;
-use Cycle\Database\Exception\StatementException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
@@ -16,10 +15,8 @@
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 use Yiisoft\Data\Cycle\Tests\Support\NotSupportedFilter;
 use Yiisoft\Data\Cycle\Tests\Support\StubFilter;
-use Yiisoft\Data\Cycle\Tests\Support\StubFilterHandler;
 use Yiisoft\Data\Reader\Filter\Equals;
 use Yiisoft\Data\Reader\Iterable\ValueReader\FlatValueReader;
-use Yiisoft\Data\Reader\Iterable\ValueReader\ValueReaderInterface;
 use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Data\Tests\Common\FixtureTrait;
 
diff --git a/tests/Support/StubFilterHandler.php b/tests/Support/StubFilterHandler.php
index b85586e..30152b4 100644
--- a/tests/Support/StubFilterHandler.php
+++ b/tests/Support/StubFilterHandler.php
@@ -23,7 +23,7 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
         /** @var StubFilter $filter */
         return ['field', 'symbol', 'value'];
     }
-    
+
     #[\Override]
     public function match(array|object $item, FilterInterface $filter, Context $context): bool
     {
diff --git a/tests/Unit/Reader/EntityReaderTest.php b/tests/Unit/Reader/EntityReaderTest.php
index 7dfdba6..8767249 100644
--- a/tests/Unit/Reader/EntityReaderTest.php
+++ b/tests/Unit/Reader/EntityReaderTest.php
@@ -16,7 +16,7 @@ public function testNormalizeSortingCriteria(): void
         // Test the functionality through a public method that uses normalizeSortingCriteria internally
         $select = $this->createMock(SelectQuery::class);
         $select->expects($this->once())->method('orderBy')->with(['email' => 'ASC'])->willReturnSelf();
-        
+
         $reader = new EntityReader($select);
         $reader->withSort(Sort::only(['email'])->withOrderString('+email'))->getSql();
     }