Fixed issues reported by phpstan

Author: rkrx

src/Builder/Helpers/RecursiveStructureAccess.php

@@ -7,7 +7,7 @@
 class RecursiveStructureAccess {
 	/**
 	 * @param object|array<string, mixed> $structure
-	 * @param string|array<int, string> $path
+	 * @param string|string[] $path
 	 * @return bool
 	 */
 	public static function recursiveHas($structure, $path): bool {
@@ -17,7 +17,7 @@ public static function recursiveHas($structure, $path): bool {
 
 	/**
 	 * @param object|array<string, mixed> $structure
-	 * @param string|array<int, string> $path
+	 * @param string|string[] $path
 	 * @param mixed $default
 	 * @return mixed
 	 */
@@ -40,7 +40,7 @@ public static function recursiveGet($structure, $path, $default) {
 
 	/**
 	 * @param mixed $structure
-	 * @param array<int, string> $path
+	 * @param string[] $path
 	 * @return bool
 	 */
 	private static function _recursiveHas($structure, array $path): bool {
@@ -59,8 +59,8 @@ private static function _recursiveHas($structure, array $path): bool {
 	}
 
 	/**
-	 * @param string|array<int, string> $path
-	 * @return array<int, string>
+	 * @param string|string[] $path
+	 * @return string[]
 	 */
 	private static function getArrayPath($path): array {
 		if(is_array($path)) {

src/Builder/Insert.php

@@ -129,8 +129,8 @@ public function addOrUpdateExpr(string $expr, ...$args) {
 
 	/**
 	 * @param array<string, null|bool|int|float|string|DateTimeInterface> $data
-	 * @param array<int, string>|null $mask
-	 * @param array<int, string>|null $excludeFields
+	 * @param null|string[] $mask
+	 * @param null|string[] $excludeFields
 	 * @return $this
 	 */
 	public function addAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
@@ -142,8 +142,8 @@ public function addAll(array $data, ?array $mask = null, ?array $excludeFields =
 
 	/**
 	 * @param array<string, null|bool|int|float|string|DateTimeInterface> $data
-	 * @param array<int, string>|null $mask
-	 * @param array<int, string>|null $excludeFields
+	 * @param null|string[] $mask
+	 * @param null|string[] $excludeFields
 	 * @return $this
 	 */
 	public function updateAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
@@ -157,7 +157,7 @@ public function updateAll(array $data, ?array $mask = null, ?array $excludeField
 
 	/**
 	 * @param array<string, null|bool|int|float|string|DateTimeInterface> $data
-	 * @param array<int, string>|null $mask
+	 * @param null|string[] $mask
 	 * @param array<int, string>|null $excludeFields
 	 * @return $this
 	 */

src/Builder/Internal/ConditionBuilder.php

@@ -38,11 +38,11 @@ public static function build(Database $db, string $query, array $conditions, str
 	}
 
 	/**
-	 * @param array<int, string> $conditions
+	 * @param string[] $conditions
 	 * @param string $expression
 	 * @param array<int, null|string|array<int, null|scalar>|Builder\DBExpr|Builder\Select> $arguments
 	 * @param Database $db
-	 * @return array<int, string>
+	 * @return string[]
 	 */
 	private static function buildCondition(array $conditions, string $expression, array $arguments, Database $db): array {
 		$expr = $db->quoteExpression($expression, $arguments);

src/Builder/RunnableSelect.php

@@ -46,7 +46,7 @@ public function setPreserveTypes(bool $preserveTypes = true);
 	 * @template K of int
 	 * @template V
 	 * @param null|callable(array<string, null|scalar>): (void|DBIgnoreRow|array<K, V>) $callback
-	 * @return ($callback is null ? array<int, array<int, null|scalar>> : array<int, array<K, V>>)
+	 * @return ($callback is null ? list<array<int, null|scalar>> : array<int, array<K, V>>)
 	 */
 	public function fetchIndexedRows($callback = null): array;
 
@@ -62,7 +62,7 @@ public function fetchRows($callback = null): array;
 	 * @template K
 	 * @template V
 	 * @param null|callable(array<string, null|scalar>): (void|DBIgnoreRow|array<K, V>) $callback
-	 * @return ($callback is null ? Generator<int, array<string, mixed>> : Generator<int, array<K, V>>)
+	 * @return ($callback is null ? Generator<int, array<string, null|scalar>> : Generator<int, array<K, V>>)
 	 */
 	public function fetchRowsLazy($callback = null);
 

src/Builder/Traits/GroupByBuilder.php

@@ -6,7 +6,7 @@
 trait GroupByBuilder {
 	use AbstractDB;
 
-	/** @var array<int, string> */
+	/** @var string[] */
 	private $groupBy = [];
 
 	/**

src/Databases/MySQL/MySQLRunnableSelect.php

@@ -249,7 +249,7 @@ public function getIterator(): Traversable {
 	}
 
 	/**
-	 * @template TFnReturnType of array<string, null|scalar>
+	 * @template TFnReturnType of array<int|string, mixed>
 	 * @param null|(callable(array<string, null|scalar>): (TFnReturnType|DBIgnoreRow|null|void)) $callback
 	 * @param int $mode
 	 * @param mixed $arg0
@@ -279,6 +279,7 @@ private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 					return $resultData;
 				});
 			}
+			return $data;
 		});
 	}