Raise PHPStan from level 5 to level 7

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-  level: 5
+  level: 7
   paths:
     - src/
     - tests/

src/Db.php

@@ -55,6 +55,7 @@ public function getSql(): Sql
         return $this->currentSql;
     }
 
+    /** @param array<int, mixed>|null $extra */
     public function prepare(string $queryString, mixed $object = '\stdClass', array|null $extra = null): PDOStatement
     {
         $statement = $this->connection->prepare($queryString);
@@ -72,6 +73,7 @@ public function prepare(string $queryString, mixed $object = '\stdClass', array|
         return $statement;
     }
 
+    /** @param array<int, mixed>|null $params */
     public function query(string $rawSql, array|null $params = null): static
     {
         $this->currentSql->setQuery($rawSql, $params);

src/Mapper.php

@@ -525,7 +525,7 @@ protected function transformSingleRow(object $row, string $entityName): object
     {
         $newRow = $this->getNewEntityByName($entityName);
 
-        foreach ($row as $prop => $value) {
+        foreach (get_object_vars($row) as $prop => $value) {
             $this->inferSet($newRow, $prop, $value);
         }
 
@@ -557,7 +557,11 @@ protected function inferGet(object &$object, string $prop): mixed
         }
     }
 
-    /** @param array<int, mixed> $row */
+    /**
+     * @param array<int, mixed> $row
+     *
+     * @return SplObjectStorage<object, Collection>
+     */
     protected function createEntities(
         array $row,
         PDOStatement $statement,
@@ -573,6 +577,10 @@ protected function createEntities(
         //Reversely traverses the columns to avoid conflicting foreign key names
         foreach (array_reverse($row, true) as $col => $value) {
             $columnMeta    = $statement->getColumnMeta($col);
+            if ($columnMeta === false) {
+                continue;
+            }
+
             $columnName    = $columnMeta['name'];
             $primaryName   = $this->getStyle()->identifier(
                 $entities[$entityInstance]->getName(),
@@ -590,7 +598,11 @@ protected function createEntities(
         return $entities;
     }
 
-    /** @return array<int, object> */
+    /**
+     * @param SplObjectStorage<object, Collection> $entities
+     *
+     * @return array<int, object>
+     */
     protected function buildEntitiesInstances(
         Collection $collection,
         SplObjectStorage $entities,
@@ -620,6 +632,7 @@ protected function buildEntitiesInstances(
         return $entitiesInstances;
     }
 
+    /** @param SplObjectStorage<object, Collection> $entities */
     protected function postHydrate(SplObjectStorage $entities): void
     {
         $entitiesClone = clone $entities;
@@ -639,6 +652,7 @@ protected function postHydrate(SplObjectStorage $entities): void
         }
     }
 
+    /** @param SplObjectStorage<object, Collection> $entities */
     protected function tryHydration(SplObjectStorage $entities, object $sub, string $field, mixed &$v): void
     {
         $tableName = $entities[$sub]->getName();
@@ -678,6 +692,7 @@ protected function getAllProperties(object $object): array
         return $cols;
     }
 
+    /** @param SplObjectStorage<object, Collection> $hydrated */
     private function parseHydrated(SplObjectStorage $hydrated): mixed
     {
         $this->tracked->addAll($hydrated);
@@ -686,6 +701,7 @@ private function parseHydrated(SplObjectStorage $hydrated): mixed
         return $hydrated->current();
     }
 
+    /** @return SplObjectStorage<object, Collection>|false */
     private function fetchHydrated(Collection $collection, PDOStatement $statement): SplObjectStorage|false
     {
         if (!$collection->hasMore()) {
@@ -711,6 +727,7 @@ private function createStatement(
         return $statement;
     }
 
+    /** @return SplObjectStorage<object, Collection>|false */
     private function fetchSingle(
         Collection $collection,
         PDOStatement $statement,
@@ -733,6 +750,7 @@ private function fetchSingle(
         return $entities;
     }
 
+    /** @return SplObjectStorage<object, Collection>|false */
     private function fetchMulti(
         Collection $collection,
         PDOStatement $statement,

src/Sql.php

@@ -30,6 +30,7 @@ class Sql
     /** @var array<int, mixed> */
     protected array $params = [];
 
+    /** @param array<int, mixed>|null $params */
     public function __construct(string $rawSql = '', array|null $params = null)
     {
         $this->setQuery($rawSql, $params);
@@ -52,6 +53,7 @@ public function getParams(): array
         return $this->params;
     }
 
+    /** @param array<int, mixed>|null $params */
     public function setQuery(string $rawSql, array|null $params = null): static
     {
         $this->query = $rawSql;
@@ -62,6 +64,7 @@ public function setQuery(string $rawSql, array|null $params = null): static
         return $this;
     }
 
+    /** @param array<int, mixed>|null $params */
     public function appendQuery(mixed $sql, array|null $params = null): static
     {
         $this->query = trim($this->query) . ' ' . $sql;