Merge branch 'master' into params-type

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Enh #801: Remove unnecessary symbol `\\` from `rtrim()` function inside `DbStringHelper::baseName()` method (@Tigrov)
 - Bug #801: Fix bug with `Quoter::$tablePrefix` when change `AbstractConnection::$tablePrefix` property (@Tigrov)
 - Enh #809: Add psalm type for parameters to bind to the SQL statement (@vjik)
+- Enh #810: Add more specific psalm type for `QueryFunctionsInterface::count()` result (@vjik)
 
 ## 1.2.0 November 12, 2023
 

src/Query/Query.php

@@ -296,6 +296,7 @@ public function count(string $sql = '*'): int|string
             return 0;
         }
 
+        /** @psalm-var non-negative-int|string */
         return $count <= PHP_INT_MAX ? (int) $count : $count;
     }
 

src/Query/QueryFunctionsInterface.php

@@ -39,6 +39,8 @@ public function average(string $sql): int|float|null|string;
      * @return int|string Number of records. The result may be a string depending on the underlying database engine and
      * to support integer values higher than a 32bit PHP integer can handle.
      *
+     * @psalm-return non-negative-int|string
+     *
      * Note: Make sure you quote column names in the expression.
      */
     public function count(string $sql = '*'): int|string;