Use dev version of Yii Data + increase psalm level to 1

composer.json

@@ -27,10 +27,12 @@
             "url": "https://github.com/sponsors/yiisoft"
         }
     ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": "^8.0",
         "yiisoft/db": "^1.0",
-        "yiisoft/data": "^1.0"
+        "yiisoft/data": "dev-master"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="2"
+    errorLevel="1"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/AbstractQueryDataReader.php

@@ -140,15 +140,15 @@
 
     public function getPreparedQuery(): QueryInterface
     {
         $query = $this->applyFilter(clone $this->query);
         $query = $this->applyHaving($query);
 
         if ($this->limit) {
             $query->limit($this->limit);
         }
 
         if ($this->offset) {
             $query->offset($this->offset);
         }
 
         if ($criteria = $this->sort?->getCriteria()) {
@@ -158,7 +158,7 @@
         return $query;
     }
 
     protected function getHandlerByOperation(string $operation): QueryHandlerInterface
     {
         if (!isset($this->filterHandlers[$operation])) {
             throw new RuntimeException(sprintf('Operation "%s" is not supported', $operation));
@@ -167,7 +167,7 @@
         return $this->filterHandlers[$operation];
     }
 
     protected function applyFilter(QueryInterface $query): QueryInterface
     {
         if ($this->filter !== null) {
             $query = $this->getHandlerByOperation($this->filter::getOperator())
@@ -177,7 +177,7 @@
         return $query;
     }
 
     protected function applyHaving(QueryInterface $query): QueryInterface
     {
         if ($this->having !== null) {
             $query = $this->getHandlerByOperation($this->having::getOperator())
@@ -206,7 +206,7 @@
      */
     public function withLimit(int $limit): static
     {
         if ($limit < 0) {
             throw new InvalidArgumentException('$limit must not be less than 0.');
         }
 
@@ -310,6 +310,7 @@
 
     /**
      * @return QueryHandlerInterface[]
+     * @psalm-return array<string, QueryHandlerInterface>
      */
     private function prepareHandlers(QueryHandlerInterface ...$queryHandlers): array
     {
@@ -337,6 +338,7 @@
     public function read(): array
     {
         if ($this->data === null) {
+            /** @psalm-var array<TKey, TValue> */
             $this->data = $this->getPreparedQuery()->all();
         }
 

src/Filter/CompareFilter.php

@@ -30,7 +30,7 @@
 
     public function withIgnoreNull(bool $ignoreNull = true): static
     {
         $new = clone $this;
         $new->ignoreNull = $ignoreNull;
 
         return $new;
@@ -58,13 +58,9 @@
         return $value;
     }
 
-    /**
-     * @psalm-param array<int, mixed> $values
-     * @return array
-     */
     protected function formatValues(array $values): array
     {
         return array_map([$this, 'formatValue'], $values);
     }
 
     public function toCriteriaArray(): array