- Adjustments made on the base of PHPStan proposals

Author: rkrx

src/Builder/RunnableInsert.php

@@ -20,7 +20,7 @@ public function __construct(MySQL $db, array $options = []) {
 	}
 
 	/**
-	 * @param array|Traversable $rows
+	 * @param array|Traversable|mixed $rows
 	 * @return int[] Insert IDs
 	 */
 	public function insertRows($rows) {

src/Builder/RunnableSelect.php

@@ -156,7 +156,7 @@ public function fetchGroups(array $fields) {
 		foreach($rows as $row) {
 			$tmp = &$result;
 			foreach($fields as $field) {
-				$value = $row[$field];
+				$value = (string) $row[$field];
 				if(!array_key_exists($value, $tmp)) {
 					$tmp[$value] = [];
 				}

src/Builder/Select.php

@@ -25,7 +25,7 @@ class Select extends Statement {
 	use OffsetBuilder;
 	use UnionBuilder;
 
-	/** @var string[] */
+	/** @var array<int|string, string> */
 	private $fields = [];
 	/** @var bool */
 	private $calcFoundRows = false;

src/Builder/Traits/CreateDDLRunnable.php

@@ -7,7 +7,7 @@
 trait CreateDDLRunnable {
 	/**
 	 * @param DatabaseStatement $query
-	 * @param callback $callbackFn
+	 * @param callable|null $callbackFn
 	 * @return DDLRunnable
 	 */
 	public function createPreparable(DatabaseStatement $query, callable $callbackFn = null) {

src/Builder/Traits/HavingBuilder.php

@@ -12,7 +12,7 @@ trait HavingBuilder {
 
 	/**
 	 * @param string|array|OptionalExpression $expression
-	 * @param mixed[] $args
+	 * @param array<int, mixed> $args
 	 * @return $this
 	 */
 	public function having($expression, ...$args) {

src/Builder/Traits/JoinBuilder.php

@@ -12,7 +12,7 @@ trait JoinBuilder {
 	 * @param string $alias
 	 * @param string $table
 	 * @param string $expression
-	 * @param mixed[] $args
+	 * @param array<int, mixed> $args
 	 * @return $this
 	 */
 	public function joinInner($alias, $table, $expression = null, ...$args) {
@@ -23,7 +23,7 @@ public function joinInner($alias, $table, $expression = null, ...$args) {
 	 * @param string $alias
 	 * @param string $table
 	 * @param string $expression
-	 * @param mixed[] $args
+	 * @param array<int, mixed> $args
 	 * @return $this
 	 */
 	public function joinLeft($alias, $table, $expression, ...$args) {
@@ -34,7 +34,7 @@ public function joinLeft($alias, $table, $expression, ...$args) {
 	 * @param string $alias
 	 * @param string $table
 	 * @param string $expression
-	 * @param mixed[] $args
+	 * @param array<int, mixed> $args
 	 * @return $this
 	 */
 	public function joinRight($alias, $table, $expression, ...$args) {
@@ -66,7 +66,7 @@ protected function buildJoins($query) {
 	 * @param string $alias
 	 * @param string $name
 	 * @param string $expression
-	 * @param mixed[] $arguments
+	 * @param array<int, mixed> $arguments
 	 * @return $this
 	 */
 	private function addJoin($type, $alias, $name, $expression = null, array $arguments = []) {

src/Builder/Traits/LimitBuilder.php

@@ -2,18 +2,18 @@
 namespace Kir\MySQL\Builder\Traits;
 
 trait LimitBuilder {
-	/** @var int */
+	/** @var int|null */
 	private $limit = null;
 
 	/**
-	 * @return int
+	 * @return int|null
 	 */
 	protected function getLimit() {
 		return $this->limit;
 	}
 
 	/**
-	 * @param int $limit
+	 * @param int|null $limit
 	 * @return $this
 	 */
 	public function limit($limit) {
@@ -23,7 +23,7 @@ public function limit($limit) {
 
 	/**
 	 * @param string $query
-	 * @param null $offset
+	 * @param int|null $offset
 	 * @return string
 	 */
 	protected function buildLimit($query, $offset = null) {

src/Builder/Traits/OrderByBuilder.php

@@ -57,7 +57,7 @@ protected function buildOrder($query) {
 	}
 
 	/**
-	 * @param string $expression
+	 * @param string|array $expression
 	 * @param string $direction
 	 */
 	private function addOrder($expression, $direction) {

src/Builder/Traits/TableNameBuilder.php

@@ -9,11 +9,11 @@ trait TableNameBuilder {
 
 	/**
 	 * @param string $alias
-	 * @param string $name
+	 * @param string|array|object $name
 	 * @return string
 	 */
 	protected function buildTableName($alias, $name) {
-		if(is_object($name) && !($name instanceof VirtualTable)) {
+		if(is_object($name) && !($name instanceof VirtualTable) && method_exists($name, '__toString')) {
 			$name = (string) $name;
 			$lines = explode("\n", $name);
 			foreach($lines as &$line) {

src/Builder/Traits/UnionBuilder.php

@@ -1,16 +1,14 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
-use Kir\MySQL\Builder\Select;
-
 trait UnionBuilder {
 	use AbstractDB;
 
-	/** @var array */
+	/** @var array<int, array<int, string|Kir\MySQL\Builder\Select>> */
 	private $unions = [];
 
 	/**
-	 * @param string[]|Select[] $queries
+	 * @param array<int, string|Kir\MySQL\Builder\Select> $queries
 	 * @return $this
 	 */
 	public function union(...$queries) {
@@ -21,7 +19,7 @@ public function union(...$queries) {
 	}
 
 	/**
-	 * @param string[]|Select[] $queries
+	 * @param array<int, string|Kir\MySQL\Builder\Select> $queries
 	 * @return $this
 	 */
 	public function unionAll(...$queries) {