From cfea993fb559d6bf72a64175139195fa90306b16 Mon Sep 17 00:00:00 2001
From: darkdef <darkdef@gmail.com>
Date: Mon, 28 Feb 2022 20:20:41 +0300
Subject: [PATCH 1/3] Pdo 2. Fix psalm

---
 src/DMLQueryBuilder.php     | 5 +++--
 src/PDO/CommandPDOMssql.php | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
index ce8dcb6a0..92fb50037 100644
--- a/src/DMLQueryBuilder.php
+++ b/src/DMLQueryBuilder.php
@@ -14,6 +14,7 @@
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Query\DMLQueryBuilder as AbstractDMLQueryBuilder;
 use Yiisoft\Db\Query\QueryBuilderInterface;
+use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Query\QueryInterface;
 
 final class DMLQueryBuilder extends AbstractDMLQueryBuilder
@@ -26,7 +27,7 @@ public function __construct(private QueryBuilderInterface $queryBuilder)
     /**
      * @throws Exception|InvalidArgumentException|InvalidConfigException|NotSupportedException
      */
-    public function insertEx(string $table, QueryInterface|array $columns, array &$params = []): string
+    public function insertEx(string $table, Query|array $columns, array &$params = []): string
     {
         /**
          * @psalm-var string[] $names
@@ -83,7 +84,7 @@ public function resetSequence(string $tableName, mixed $value = null): string
      */
     public function upsert(
         string $table,
-        QueryInterface|array $insertColumns,
+        Query|array $insertColumns,
         bool|array $updateColumns,
         array &$params = []
     ): string {
diff --git a/src/PDO/CommandPDOMssql.php b/src/PDO/CommandPDOMssql.php
index 2ac74c7f6..8cfceeee7 100644
--- a/src/PDO/CommandPDOMssql.php
+++ b/src/PDO/CommandPDOMssql.php
@@ -21,7 +21,7 @@ public function __construct(private ConnectionPDOInterface $db, QueryCache $quer
 
     /**
      * @inheritDoc
-     */
+    */
     public function insertEx(string $table, array $columns): bool|array
     {
         $params = [];
@@ -30,7 +30,10 @@ public function insertEx(string $table, array $columns): bool|array
         $this->setSql($sql)->bindValues($params);
         $this->prepare(false);
 
-        return $this->queryOne();
+        /** @psalm-var array|bool */
+        $result = $this->queryOne();
+
+        return is_array($result) ? $result: false;
     }
 
     public function queryBuilder(): QueryBuilderInterface

From 316967ae4741e778ba5459b5945ed214c7d29242 Mon Sep 17 00:00:00 2001
From: darkdef <darkdef@gmail.com>
Date: Mon, 28 Feb 2022 20:23:38 +0300
Subject: [PATCH 2/3] styleci fix

---
 src/DMLQueryBuilder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
index 92fb50037..27c3a1af1 100644
--- a/src/DMLQueryBuilder.php
+++ b/src/DMLQueryBuilder.php
@@ -15,7 +15,6 @@
 use Yiisoft\Db\Query\DMLQueryBuilder as AbstractDMLQueryBuilder;
 use Yiisoft\Db\Query\QueryBuilderInterface;
 use Yiisoft\Db\Query\Query;
-use Yiisoft\Db\Query\QueryInterface;
 
 final class DMLQueryBuilder extends AbstractDMLQueryBuilder
 {

From 180eece9a1b75a77caf2b96b43ff1bae070562b3 Mon Sep 17 00:00:00 2001
From: darkdef <darkdef@gmail.com>
Date: Mon, 28 Feb 2022 20:25:01 +0300
Subject: [PATCH 3/3] styleci fix

---
 src/PDO/CommandPDOMssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PDO/CommandPDOMssql.php b/src/PDO/CommandPDOMssql.php
index 8cfceeee7..b5e467c18 100644
--- a/src/PDO/CommandPDOMssql.php
+++ b/src/PDO/CommandPDOMssql.php
@@ -33,7 +33,7 @@ public function insertEx(string $table, array $columns): bool|array
         /** @psalm-var array|bool */
         $result = $this->queryOne();
 
-        return is_array($result) ? $result: false;
+        return is_array($result) ? $result : false;
     }
 
     public function queryBuilder(): QueryBuilderInterface