Enhanced typing for phpstan

Author: rkrx

composer.json

@@ -16,7 +16,8 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": ">= 6.0",
-		"phpstan/phpstan": "*@stable"
+		"phpstan/phpstan": "*@stable",
+		"jetbrains/phpstorm-attributes": "^1.0"
 	},
 	"autoload": {
 		"psr-4": {

src/Builder/RunnableSelect.php

@@ -41,20 +41,36 @@ public function clearValues();
 	public function setPreserveTypes(bool $preserveTypes = true);
 
 	/**
-	 * @param null|callable(array<string, mixed>): array<string, mixed>|callable(array<string, mixed>): void|callable(array<string, mixed>): DBIgnoreRow $callback
-	 * @return array<int, array<string, mixed>>
+	 * Fetches all rows using PDO::FETCH_NUM
+	 *
+	 * @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>>)
+	 */
+	public function fetchIndexedRows($callback = null): array;
+
+	/**
+	 * @template K
+	 * @template V
+	 * @param null|callable(array<string, null|scalar>): (void|DBIgnoreRow|array<K, V>) $callback
+	 * @return ($callback is null ? array<int, array<string, null|scalar>> : array<int, array<K, V>>)
 	 */
 	public function fetchRows($callback = null): array;
 
 	/**
-	 * @param null|callable(array<string, mixed>): (array<mixed, mixed>|null|void) $callback
-	 * @return Generator<int, array<string, mixed>>
+	 * @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>>)
 	 */
 	public function fetchRowsLazy($callback = null);
 
 	/**
-	 * @param null|callable(array<string, mixed>): array<string, mixed>|callable(array<string, mixed>): void|callable(array<string, mixed>): DBIgnoreRow $callback
-	 * @return array<string, mixed>
+	 * @template K
+	 * @template V
+	 * @param null|callable(array<string, mixed>): (array<K, V>|void|DBIgnoreRow) $callback
+	 * @return ($callback is null ? array<string, null|scalar> : array<K, V>)
 	 */
 	public function fetchRow($callback = null): array;
 
@@ -63,7 +79,7 @@ public function fetchRow($callback = null): array;
 	 * @template U
 	 * @param class-string<T> $className
 	 * @param null|callable(T): U $callback
-	 * @return T[]|U[]
+	 * @return ($callback is null ? array<int, T> : array<int, U>)
 	 */
 	public function fetchObjects(string $className = 'stdClass', $callback = null): array;
 
@@ -72,7 +88,7 @@ public function fetchObjects(string $className = 'stdClass', $callback = null):
 	 * @template U
 	 * @param class-string<T> $className
 	 * @param null|callable(T): U $callback
-	 * @return Generator<int, T|U>
+	 * @return ($callback is null ? Generator<int, T> : Generator<int, U>)
 	 */
 	public function fetchObjectsLazy($className = null, $callback = null);
 
@@ -81,7 +97,7 @@ public function fetchObjectsLazy($className = null, $callback = null);
 	 * @template U
 	 * @param class-string<T> $className
 	 * @param null|callable(T): U $callback
-	 * @return T|U
+	 * @return ($callback is null ? T : U)
 	 */
 	public function fetchObject($className = null, $callback = null);
 
@@ -99,8 +115,8 @@ public function fetchGroups(array $fields): array;
 
 	/**
 	 * @template T
-	 * @param null|callable(null|bool|int|float|string): T $fn
-	 * @return array<int, T|string>
+	 * @param null|callable(null|scalar): T $fn
+	 * @return ($fn is null ? array<int, null|scalar> : array<int, T>)
 	 */
 	public function fetchArray(?callable $fn = null): array;
 
@@ -109,7 +125,7 @@ public function fetchArray(?callable $fn = null): array;
 	 * @template TCastFn
 	 * @param TDefault $default
 	 * @param null|callable(null|bool|string|int|float): TCastFn $fn
-	 * @return null|bool|string|int|float|TDefault|TCastFn
+	 * @return ($fn is null ? null|scalar|TDefault : TCastFn)
 	 */
 	public function fetchValue($default = null, ?callable $fn = null);
 

src/Databases/MySQL/MySQLRunnableSelect.php

@@ -16,7 +16,7 @@
 
 /**
  */
-class MySQLRunnableSelect extends MySQLSelect implements RunnableSelect {
+class MySQLRunnableSelect extends MySQLSelect {
 	/** @var array<string, mixed> */
 	private $values = [];
 	/** @var bool */
@@ -68,6 +68,13 @@ public function setPreserveTypes(bool $preserveTypes = true) {
 		return $this;
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function fetchIndexedRows($callback = null): array {
+		return $this->fetchAll($callback, PDO::FETCH_NUM);
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -244,10 +251,12 @@ public function getIterator(): Traversable {
 	}
 
 	/**
-	 * @param null|callable(array<string, mixed>): (array<string, mixed>|DBIgnoreRow|null|void) $callback
+	 * @template TFnParamType of array<string, null|scalar>
+	 * @template TFnReturnType of array<string, null|scalar>
+	 * @param null|callable(TFnParamType): (TFnReturnType|DBIgnoreRow|null|void) $callback
 	 * @param int $mode
 	 * @param mixed $arg0
-	 * @return array<string, mixed>[]
+	 * @return ($callback is null ? array<int, ($mode is PDO::FETCH_NUM ? array<int, null|scalar> : array<string, null|scalar>)> : array<int, TFnReturnType|TFnParamType>)
 	 */
 	private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) {
@@ -280,12 +289,12 @@ private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 	/**
 	 * @template T
 	 * @template U
-	 * @param callable(T): U $callback
+	 * @param null|callable(T): U $callback
 	 * @param int $mode
 	 * @param mixed $arg0
-	 * @return Generator<int, T|U>
+	 * @return ($callback is null ? Generator<int, T> : Generator<int, U>)
 	 */
-	private function fetchLazy($callback, int $mode = PDO::FETCH_ASSOC, $arg0 = null): Generator {
+	private function fetchLazy($callback = null, int $mode = PDO::FETCH_ASSOC, $arg0 = null): Generator {
 		$statement = $this->createStatement();
 		$statement->setFetchMode($mode, $arg0);
 		try {