Allow to create custom items

yiisoft · Nov 21, 2023 · 1c02b8c · 1c02b8c
1 parent b0052d1
commit 1c02b8c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/AbstractQueryDataReader.php b/src/AbstractQueryDataReader.php
@@ -338,8 +338,14 @@ public function getSort(): ?Sort
     public function read(): array
     {
         if ($this->data === null) {
-            /** @psalm-var array<TKey, TValue> */
-            $this->data = $this->getPreparedQuery()->all();
+            $this->data = [];
+            /**
+             * @psalm-var TKey $key
+             * @psalm-var array $row
+             */
+            foreach ($this->getPreparedQuery()->all() as $key => $row) {
+                $this->data[$key] = $this->createItem($row);
+            }
         }
 
         return $this->data;
@@ -362,4 +368,9 @@ public function readOne(): array|object|null
 
         return $this->withLimit(1)->getIterator()->current();
     }
+
+    /**
+     * @psalm-return TValue
+     */
+    abstract protected function createItem(array $row): array|object;
 }
diff --git a/src/QueryDataReader.php b/src/QueryDataReader.php
@@ -8,10 +8,15 @@
  * Base class for `QueryDataReaderInterface`
  *
  * @template TKey as array-key
- * @template TValue as array|object
+ * @template TValue as array
  *
  * @extends AbstractQueryDataReader<TKey, TValue>
  */
 final class QueryDataReader extends AbstractQueryDataReader
 {
+    protected function createItem(array $row): array
+    {
+        /** @psalm-var TValue */
+        return $row;
+    }
 }