Enhanced typing

Author: rkrx

src/Builder/Helpers/ConditionAddHelper.php

@@ -2,12 +2,18 @@
 namespace Kir\MySQL\Builder\Helpers;
 
 use Kir\MySQL\Builder\Expr\OptionalExpression;
+use Kir\MySQL\Builder\Internal\Types;
+use Kir\MySQL\Builder\Traits\WhereBuilder;
 
+/**
+ * @phpstan-import-type DBParameterValueType from Types
+ * @phpstan-import-type DBWhereExpressionType from WhereBuilder
+ */
 abstract class ConditionAddHelper {
 	/**
-	 * @param callable(string|array<string, mixed>, array<int, mixed>): void $addFn
-	 * @param string|array<string, mixed>|object|OptionalExpression $expression
-	 * @param array<int, mixed> $args
+	 * @param callable(string|array<string, null|scalar>, array<int, DBParameterValueType>): void $addFn
+	 * @param DBWhereExpressionType $expression
+	 * @param array<DBParameterValueType> $args
 	 */
 	public static function addCondition(callable $addFn, $expression, array $args): void {
 		if($expression instanceof OptionalExpression) {
@@ -26,7 +32,7 @@ public static function addCondition(callable $addFn, $expression, array $args):
 	/**
 	 * @param callable(string|array<string, mixed>, array<int, mixed>): void $addFn
 	 * @param array<string, mixed> $expression
-	 * @param array<int, mixed> $args
+	 * @param array<int, DBParameterValueType> $args
 	 */
 	private static function addAsArray(callable $addFn, array $expression, array $args): void {
 		if(count($expression) > 0) {

src/Builder/Internal/ConditionBuilder.php

@@ -4,6 +4,7 @@
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\Expr\OptionalExpression;
 use Kir\MySQL\Database;
+use Stringable;
 
 final class ConditionBuilder {
 	/**
@@ -30,6 +31,7 @@ public static function build(Database $db, string $query, array $conditions, str
 					}
 				}
 			} else {
+				/** @var Stringable|string $expression */
 				$arr = self::buildCondition($arr, (string) $expression, $arguments, $db);
 			}
 		}

src/Builder/Internal/Types.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Kir\MySQL\Builder\Internal;
+
+use DateTimeInterface;
+use Kir\MySQL\Builder\DBExpr;
+use Kir\MySQL\Builder\Expr\OptionalExpression;
+use Kir\MySQL\Builder\Select;
+use Kir\MySQL\Tools\VirtualTable;
+use Stringable;
+
+/**
+ * @phpstan-type DBParameterValueType null|scalar|Stringable|DBExpr|Select|DateTimeInterface|array<null|scalar|Stringable>
+ * @phpstan-type DBTableNameType string|array<int, array<string, null|scalar>>|Select|VirtualTable
+ * @phpstan-type DBFetchRowsCallableReturnType string|array<int, array<string, null|scalar>>|Select|VirtualTable
+ * @phpstan-type DBWhereExpressionType string|array<string, null|scalar|Stringable>|object|OptionalExpression
+ */
+class Types {
+}
+
+// (callable(array<string, bool|float|int|string|null>): (array<string, bool|float|int|string|null>|Kir\MySQL\Builder\Helpers\DBIgnoreRow|void|null))|null
+// (callable(array<string, bool|float|int|string|null>): (array<K, V>|Kir\MySQL\Builder\Helpers\DBIgnoreRow|void))|null
+
+// array<string, array<string, bool|float|int|string|null>|Kir\MySQL\Builder\Helpers\DBIgnoreRow>
+// array<string, bool|float|int|string|null>|Kir\MySQL\Builder\Helpers\DBIgnoreRow

src/Builder/Traits/HavingBuilder.php

@@ -1,22 +1,23 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
-use DateTimeInterface;
-use Kir\MySQL\Builder\DBExpr;
-use Kir\MySQL\Builder\Expr\OptionalExpression;
 use Kir\MySQL\Builder\Helpers\ConditionAddHelper;
 use Kir\MySQL\Builder\Internal\ConditionBuilder;
-use Kir\MySQL\Builder\Select;
+use Kir\MySQL\Builder\Internal\Types;
 
+/**
+ * @phpstan-import-type DBParameterValueType from Types
+ * @phpstan-import-type DBWhereExpressionType from Types
+ */
 trait HavingBuilder {
 	use AbstractDB;
 
-	/** @var array<int, array{string|array<string, mixed>|object|OptionalExpression, array<int, null|string|array<int, null|scalar>|DBExpr|Select>}> */
-	private $having = [];
+	/** @var array<int, array{DBWhereExpressionType, array<DBParameterValueType>}> */
+	private array $having = [];
 
 	/**
-	 * @param string|array<string, mixed>|object|OptionalExpression $expression
-	 * @param null|scalar|array<int, null|scalar>|DBExpr|Select|DateTimeInterface ...$args
+	 * @param DBWhereExpressionType $expression
+	 * @param DBParameterValueType ...$args
 	 * @return $this
 	 */
 	public function having($expression, ...$args) {

src/Builder/Traits/WhereBuilder.php

@@ -1,22 +1,25 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
-use DateTimeInterface;
-use Kir\MySQL\Builder\DBExpr;
 use Kir\MySQL\Builder\Expr\OptionalExpression;
 use Kir\MySQL\Builder\Helpers\ConditionAddHelper;
 use Kir\MySQL\Builder\Internal\ConditionBuilder;
-use Kir\MySQL\Builder\Select;
+use Kir\MySQL\Builder\Internal\Types;
+use Stringable;
 
+/**
+ * @phpstan-import-type DBParameterValueType from Types
+ * @phpstan-import-type DBWhereExpressionType from Types
+ */
 trait WhereBuilder {
 	use AbstractDB;
 
-	/** @var array<int, array{string|array<string, mixed>|object|OptionalExpression, array<int, null|string|array<int, null|scalar>|DBExpr|Select>}> */
-	private $where = [];
+	/** @var array<int, array{DBWhereExpressionType, array<DBParameterValueType>}> */
+	private array $where = [];
 
 	/**
 	 * @param string|array<string, mixed>|object|OptionalExpression $expression
-	 * @param null|scalar|array<int, null|scalar>|DBExpr|Select|DateTimeInterface ...$args
+	 * @param DBParameterValueType ...$args
 	 * @return $this
 	 */
 	public function where($expression, ...$args) {