Merge branch 'bugfix/psalm' into develop

src/Actions/AlterTable.php

@@ -106,7 +106,7 @@ public function addColumns(array $fields): self
     /**
      * Adds fields to rename.
      *
-     * @param string[] $names array of names
+     * @param array<string, string> $names array of names
      */
     public function renameColumns(array $names): self
     {

src/Statement.php

@@ -67,12 +67,13 @@ public function columnCount(): int
     public function fetchColumn(int $column = 0): mixed
     {
         try {
-            $column = $this->statement?->fetchColumn($column) ?? false;
+            /** @var mixed */
+            $result = $this->statement?->fetchColumn($column) ?? false;
         } catch (\Throwable $th) {
-            $column = false;
+            $result = false;
         }
 
-        return $column;
+        return $result;
     }
 
     /**

src/Traits/ColumnsTrait.php

@@ -11,7 +11,7 @@
 trait ColumnsTrait
 {
     /**
-     * @var (string|BaseFunction)[] column names
+     * @var array<int|string, string|BaseFunction> column names
      */
     protected array $columns = [];
 
@@ -56,7 +56,7 @@ protected function columnsPlaceholders(): array
     /**
      * Set columns.
      *
-     * @param (string|BaseFunction)[] $columns array of column names
+     * @param array<int|string, string|BaseFunction> $columns array of column names
      *
      * @return $this
      */

src/Traits/OnTrait.php

@@ -15,7 +15,7 @@
 trait OnTrait
 {
     /**
-     * @var array<int, array{type: string, name: string, sign: string, value: mixed}> on conditions
+     * @var list<array{type: string, name: string, sign: string, value: scalar|null|ScalarFunction|Condition}> on conditions
      */
     protected array $on = [];
 
@@ -41,7 +41,7 @@ protected function onQuery(Escaper $escaper): string
                 $value = '?';
             }*/
 
-            $query .= $type . ' ' . $escaper->column($name) . $sign . $value . ' ';
+            $query .= $type . ' ' . $escaper->column($name) . $sign . $escaper->column(strval($value)) . ' ';
         }
 
         return trim($query);
@@ -73,8 +73,13 @@ protected function onPlaceholders(): array
 
     /**
      * Adds condition to list.
+     *
+     * @param string $type
+     * @param string $name
+     * @param string $sign
+     * @param scalar|null|ScalarFunction|Condition $value
      */
-    protected function addOnCondition(string $type, string $name, string $sign, mixed $value): void
+    protected function addOnCondition(string $type, string $name, string $sign, string|int|float|bool|null|ScalarFunction|Condition $value): void
     {
         $this->on[] = [
             'type' => $type,
@@ -87,6 +92,10 @@ protected function addOnCondition(string $type, string $name, string $sign, mixe
     /**
      * Set first condition.
      *
+     * @param string $name
+     * @param scalar|null|ScalarFunction|Condition $value
+     * @param string $sign
+     *
      * !!! ATTENTION !!!
      * Method think that $value is name of table like 'join_table.id'
      * and do not prepare it. So be careful with sql-injections.
@@ -96,7 +105,7 @@ protected function addOnCondition(string $type, string $name, string $sign, mixe
      *
      * @return $this
      */
-    public function on(string $name, mixed $value, string $sign = '='): object
+    public function on(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;
@@ -110,6 +119,10 @@ public function on(string $name, mixed $value, string $sign = '='): object
     /**
      * Adds 'and' condition.
      *
+     * @param string $name
+     * @param scalar|null|ScalarFunction|Condition $value
+     * @param string $sign
+     *
      * !!! ATTENTION !!!
      * Method think that $value is name of table like 'join_table.id'
      * and do not prepare it. So be careful with sql-injections.
@@ -119,7 +132,7 @@ public function on(string $name, mixed $value, string $sign = '='): object
      *
      * @return $this
      */
-    public function onAnd(string $name, mixed $value, string $sign = '='): object
+    public function onAnd(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;
@@ -146,7 +159,7 @@ public function onAnd(string $name, mixed $value, string $sign = '='): object
      *
      * @return $this
      */
-    public function onOr(string $name, mixed $value, string $sign = '='): object
+    public function onOr(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;

src/Traits/SetTrait.php

@@ -11,7 +11,7 @@
 trait SetTrait
 {
     /**
-     * @var array<string, mixed> values for SET
+     * @var array<string, scalar|null|ScalarFunction> values for SET
      */
     protected array $set = [];
 
@@ -58,7 +58,7 @@ protected function setPlaceholders(): array
     /**
      * Set values for SET.
      *
-     * @param array<string, mixed> $values array of values for SET
+     * @param array<string, scalar|null|ScalarFunction> $values array of values for SET
      *
      * @return $this
      */

src/Traits/ValuesTrait.php

@@ -8,7 +8,7 @@
 trait ValuesTrait
 {
     /**
-     * @var list<list<mixed>> values for VALUES
+     * @var list<list<scalar|null|ScalarFunction>> values for VALUES
      */
     protected array $values = [];
 
@@ -63,7 +63,7 @@ protected function valuesPlaceholders(): array
     /**
      * Set values for VALUES.
      *
-     * @param list<list<mixed>> $values values for VALUES
+     * @param list<list<scalar|null|ScalarFunction>> $values values for VALUES
      *
      * @return $this
      */

src/Traits/WhereTrait.php

@@ -12,7 +12,7 @@
 trait WhereTrait
 {
     /**
-     * @var array<int, array{type: string, name: string, sign: string, value: mixed}> where conditions
+     * @var list<array{type: string, name: string, sign: string, value: scalar|null|ScalarFunction|Condition}> where conditions
      */
     protected array $where = [];
 
@@ -70,8 +70,13 @@ protected function wherePlaceholders(): array
 
     /**
      * Adds condition to list.
+     *
+     * @param string $type
+     * @param string $name
+     * @param string $sign
+     * @param scalar|null|ScalarFunction|Condition $value
      */
-    protected function addCondition(string $type, string $name, string $sign, mixed $value): void
+    protected function addCondition(string $type, string $name, string $sign, string|int|float|bool|null|ScalarFunction|Condition $value): void
     {
         $this->where[] = [
             'type' => $type,
@@ -84,12 +89,16 @@ protected function addCondition(string $type, string $name, string $sign, mixed
     /**
      * Set first condition.
      *
+     * @param string $name
+     * @param scalar|null|ScalarFunction|Condition $value
+     * @param string $sign
+     *
      * $value can be subclass of Condition (In, Beetween, etc.)
      * If $value is subclass of Condition $sign will be ignored.
      *
      * @return $this
      */
-    public function where(string $name, mixed $value, string $sign = '='): object
+    public function where(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;
@@ -103,12 +112,16 @@ public function where(string $name, mixed $value, string $sign = '='): object
     /**
      * Adds 'and' condition.
      *
+     * @param string $name
+     * @param scalar|null|ScalarFunction|Condition $value
+     * @param string $sign
+     *
      * $value can be subclass of Condition (In, Beetween, etc.)
      * If $value is subclass of Condition $sign will be ignored.
      *
      * @return $this
      */
-    public function and(string $name, mixed $value, string $sign = '='): object
+    public function and(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;
@@ -126,12 +139,16 @@ public function and(string $name, mixed $value, string $sign = '='): object
     /**
      * Adds 'or' condition.
      *
+     * @param string $name
+     * @param scalar|null|ScalarFunction|Condition $value
+     * @param string $sign
+     *
      * $value can be subclass of Condition (In, Beetween, etc.)
      * If $value is subclass of Condition $sign will be ignored.
      *
      * @return $this
      */
-    public function or(string $name, mixed $value, string $sign = '='): object
+    public function or(string $name, string|int|float|bool|null|ScalarFunction|Condition $value, string $sign = '='): object
     {
         if (empty($name)) {
             return $this;