Update yiisoft/data to stable version 2.0 and fix breaking changes

composer.json

@@ -36,7 +36,7 @@
         "ext-mbstring": "*",
         "cycle/database": "^2.11",
         "cycle/orm": "^2.9",
-        "yiisoft/data": "dev-master"
+        "yiisoft/data": "^2.0"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.7",

src/Reader/EntityReader.php

@@ -14,7 +14,6 @@
 use Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler\LikeHandlerFactory;
 use Yiisoft\Data\Reader\DataReaderInterface;
 use Yiisoft\Data\Reader\Filter\All;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Data\Cycle\Reader\Cache\CachedCollection;
@@ -40,7 +39,7 @@
     private CachedCollection $itemsCache;
     private CachedCollection $oneItemCache;
     /**
-     * @psalm-var array<class-string, FilterHandlerInterface & QueryBuilderFilterHandler> $handlers
+     * @psalm-var array<class-string, QueryBuilderFilterHandler> $handlers
      */
     private array $filterHandlers = [];
 
@@ -68,7 +67,7 @@
             new FilterHandler\InHandler(),
             new FilterHandler\LessThanHandler(),
             new FilterHandler\LessThanOrEqualHandler(),
             $likeHandler,
             new FilterHandler\NotHandler(),
         );
 
@@ -148,8 +147,7 @@
     /**
      * @psalm-mutation-free
      */
-    #[\Override]
-    public function withAddedFilterHandlers(FilterHandlerInterface ...$filterHandlers): static
+    public function withAddedFilterHandlers(QueryBuilderFilterHandler ...$filterHandlers): static
     {
         $new = clone $this;
         /** @psalm-suppress ImpureMethodCall */
@@ -207,15 +205,13 @@
         return (string)($query instanceof Select ? $query->buildQuery() : $query);
     }
 
-    private function setFilterHandlers(FilterHandlerInterface ...$filterHandlers): void
+    private function setFilterHandlers(QueryBuilderFilterHandler ...$filterHandlers): void
     {
         $handlers = [];
         foreach ($filterHandlers as $filterHandler) {
-            if ($filterHandler instanceof QueryBuilderFilterHandler) {
-                $handlers[$filterHandler->getFilterClass()] = $filterHandler;
-            }
+            $handlers[$filterHandler->getFilterClass()] = $filterHandler;
         }
         $this->filterHandlers = array_merge($this->filterHandlers, $handlers);
     }
 
     private function buildSelectQuery(): SelectQuery|Select

src/Reader/FilterHandler/AllHandler.php

@@ -8,12 +8,11 @@
 use Cycle\ORM\Select\QueryBuilder;
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\All;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class AllHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class AllHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return All::class;

src/Reader/FilterHandler/AndXHandler.php

@@ -8,12 +8,11 @@
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\AndX;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class AndXHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class AndXHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return AndX::class;

src/Reader/FilterHandler/BetweenHandler.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\Between;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class BetweenHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class BetweenHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return Between::class;

src/Reader/FilterHandler/EqualsHandler.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\Equals;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class EqualsHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class EqualsHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return Equals::class;

src/Reader/FilterHandler/EqualsNullHandler.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\EqualsNull;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class EqualsNullHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class EqualsNullHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return EqualsNull::class;

src/Reader/FilterHandler/GreaterThanHandler.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\GreaterThan;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class GreaterThanHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class GreaterThanHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return GreaterThan::class;

src/Reader/FilterHandler/GreaterThanOrEqualHandler.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\GreaterThanOrEqual;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class GreaterThanOrEqualHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class GreaterThanOrEqualHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string
     {
         return GreaterThanOrEqual::class;

src/Reader/FilterHandler/InHandler.php

@@ -7,10 +7,9 @@
 use Cycle\Database\Injection\Parameter;
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\In;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class InHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class InHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/FilterHandler/LessThanHandler.php

@@ -6,10 +6,9 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\LessThan;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class LessThanHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class LessThanHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/FilterHandler/LessThanOrEqualHandler.php

@@ -6,10 +6,9 @@
 
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\LessThanOrEqual;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class LessThanOrEqualHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class LessThanOrEqualHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php

@@ -7,9 +7,8 @@
 use Stringable;
 use Yiisoft\Data\Reader\Filter\Like;
 use Yiisoft\Data\Reader\Filter\LikeMode;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 
-abstract class BaseLikeHandler implements FilterHandlerInterface
+abstract class BaseLikeHandler
 {
     protected array $escapingReplacements = [
         '%' => '\%',

src/Reader/FilterHandler/LikeHandler/LikeHandlerFactory.php

@@ -5,14 +5,13 @@
 namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler;
 
 use RuntimeException;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 
 /**
  * @internal
  */
 final class LikeHandlerFactory
 {
-    public static function getLikeHandler(string $driverType): FilterHandlerInterface
+    public static function getLikeHandler(string $driverType): BaseLikeHandler
     {
         // default - ignored due to the complexity of testing and preventing splitting of databaseDriver argument.
         // @codeCoverageIgnoreStart

src/Reader/FilterHandler/NoneHandler.php

@@ -8,10 +8,9 @@
 use Cycle\ORM\Select\QueryBuilder;
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\None;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class NoneHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class NoneHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/FilterHandler/NotHandler.php

@@ -18,10 +18,9 @@
 use Yiisoft\Data\Reader\Filter\Like;
 use Yiisoft\Data\Reader\Filter\Not;
 use Yiisoft\Data\Reader\Filter\OrX;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class NotHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class NotHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/FilterHandler/OrXHandler.php

@@ -8,10 +8,9 @@
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler;
 use Yiisoft\Data\Reader\Filter\OrX;
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
-final class OrXHandler implements QueryBuilderFilterHandler, FilterHandlerInterface
+final class OrXHandler implements QueryBuilderFilterHandler
 {
     #[\Override]
     public function getFilterClass(): string

src/Reader/QueryBuilderFilterHandler.php

@@ -4,13 +4,12 @@
 
 namespace Yiisoft\Data\Cycle\Reader;
 
-use Yiisoft\Data\Reader\FilterHandlerInterface;
 use Yiisoft\Data\Reader\FilterInterface;
 
 interface QueryBuilderFilterHandler
 {
     /**
-     * @psalm-param array<class-string, FilterHandlerInterface & QueryBuilderFilterHandler> $handlers
+     * @psalm-param array<class-string, QueryBuilderFilterHandler> $handlers
      */
     public function getAsWhereArguments(FilterInterface $filter, array $handlers): array;
 }