Merge pull request #478: better types in Select class

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
           tools: pecl
-          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv-5.11.1, pdo_mysql
+          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
       - name: Get Composer Cache Directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

src/Select.php

@@ -50,7 +50,7 @@
  * @method mixed max($identifier) Perform aggregation (MAX) based on column or expression value.
  * @method mixed sum($identifier) Perform aggregation (SUM) based on column or expression value.
  *
- * @template TEntity of object
+ * @template-covariant TEntity of object
  */
 class Select implements IteratorAggregate, Countable, PaginableInterface
 {
@@ -130,7 +130,7 @@ public function __clone()
     /**
      * Create new Selector with applied scope. By default no scope used.
      *
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function scope(ScopeInterface $scope = null): self
     {
@@ -160,7 +160,7 @@ public function buildQuery(): SelectQuery
      *
      * @psalm-param string|int|list<string|int>|object ...$ids
      *
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function wherePK(string|int|array|object ...$ids): self
     {
@@ -195,7 +195,7 @@ public function count(string $column = null): int
     }
 
     /**
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function limit(int $limit): self
     {
@@ -205,7 +205,7 @@ public function limit(int $limit): self
     }
 
     /**
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function offset(int $offset): self
     {
@@ -267,7 +267,7 @@ public function offset(int $offset): self
      *
      * @see with()
      *
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function load(string|array $relation, array $options = []): self
     {
@@ -357,7 +357,7 @@ public function load(string|array $relation, array $options = []): self
      *
      * @see load()
      *
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     public function with(string|array $relation, array $options = []): self
     {
@@ -396,16 +396,16 @@ public function fetchOne(array $query = null): ?object
             return null;
         }
 
-        /** @var TEntity */
+        /** @var TEntity $result */
         return $this->entityFactory->make($this->loader->getTarget(), $data[0], Node::MANAGED, typecast: true);
     }
 
     /**
      * Fetch all records in a form of array.
      *
-     * @return array<int, TEntity>
+     * @return list<TEntity>
      */
-    public function fetchAll(): array
+    public function fetchAll(): iterable
     {
         return \iterator_to_array($this->getIterator(), false);
     }
@@ -434,17 +434,18 @@ public function getIterator(bool $findInHeap = false): Iterator
      *
      * @return array<array-key, array<string, mixed>>
      */
-    public function fetchData(bool $typecast = true): array
+    public function fetchData(bool $typecast = true): iterable
     {
         $node = $this->loader->createNode();
         $this->loader->loadData($node, false);
 
         if (!$typecast) {
             return $node->getResult();
         }
+
         $mapper = $this->mapperProvider->getMapper($this->loader->getTarget());
 
-        return array_map([$mapper, 'cast'], $node->getResult());
+        return \array_map([$mapper, 'cast'], $node->getResult());
     }
 
     /**
@@ -465,7 +466,7 @@ public function loadSubclasses(bool $load = true): self
      * @param list<non-empty-string> $pk
      * @param list<array|int|object|string> $args
      *
-     * @return Select<TEntity>
+     * @return static<TEntity>
      */
     private function buildCompositePKQuery(array $pk, array $args): self
     {
@@ -481,7 +482,7 @@ private function buildCompositePKQuery(array $pk, array $args): self
                 );
             }
 
-            $isAssoc = !array_is_list($values);
+            $isAssoc = !\array_is_list($values);
             foreach ($values as $key => $value) {
                 if ($isAssoc && !\in_array($key, $pk, true)) {
                     throw new InvalidArgumentException(\sprintf('Primary key `%s` not found.', $key));

tests/ORM/Functional/Driver/Common/Typecast/SchemaTest.php

@@ -198,7 +198,7 @@ public function testTypecastWithJti(): void
     }
 
     /**
-     * @covers CompositeTypecast::cast()
+     * @see CompositeTypecast::cast()
      */
     public function testUseCompositeTypecast(): void
     {

tests/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       ACCEPT_EULA: "Y"
 
   cycle-mysql_latest:
-    image: mysql:latest
+    image: mysql:8.0.37
     restart: always
     command: --default-authentication-plugin=mysql_native_password
     ports: