From b0052d10eb6d2809eee9460545de80273328a351 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Tue, 21 Nov 2023 15:05:15 +0300
Subject: [PATCH] Use dev version of Yii Data + increase psalm level to 1 (#35)

---
 composer.json                   | 4 +++-
 psalm.xml                       | 2 +-
 src/AbstractQueryDataReader.php | 2 ++
 src/Filter/CompareFilter.php    | 4 ----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 2080e40..5250dc0 100644
--- a/composer.json
+++ b/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",
diff --git a/psalm.xml b/psalm.xml
index 4ba0a00..21becf6 100644
--- a/psalm.xml
+++ b/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"
diff --git a/src/AbstractQueryDataReader.php b/src/AbstractQueryDataReader.php
index 3e0726d..cf85afb 100644
--- a/src/AbstractQueryDataReader.php
+++ b/src/AbstractQueryDataReader.php
@@ -310,6 +310,7 @@ public function withFilterHandlers(FilterHandlerInterface ...$filterHandlers): s
 
     /**
      * @return QueryHandlerInterface[]
+     * @psalm-return array<string, QueryHandlerInterface>
      */
     private function prepareHandlers(QueryHandlerInterface ...$queryHandlers): array
     {
@@ -337,6 +338,7 @@ public function getSort(): ?Sort
     public function read(): array
     {
         if ($this->data === null) {
+            /** @psalm-var array<TKey, TValue> */
             $this->data = $this->getPreparedQuery()->all();
         }
 
diff --git a/src/Filter/CompareFilter.php b/src/Filter/CompareFilter.php
index 57630f4..a7bb367 100644
--- a/src/Filter/CompareFilter.php
+++ b/src/Filter/CompareFilter.php
@@ -58,10 +58,6 @@ protected function formatValue(mixed $value): mixed
         return $value;
     }
 
-    /**
-     * @psalm-param array<int, mixed> $values
-     * @return array
-     */
     protected function formatValues(array $values): array
     {
         return array_map([$this, 'formatValue'], $values);