Fix #18821: Additional type fixes (#19217)

yiisoft · Feb 9, 2022 · 9fbdc9f · 9fbdc9f
1 parent 730f0e5
commit 9fbdc9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/framework/db/conditions/InConditionBuilder.php b/framework/db/conditions/InConditionBuilder.php
@@ -7,6 +7,7 @@
 
 namespace yii\db\conditions;
 
+use yii\db\Expression;
 use yii\db\ExpressionBuilderInterface;
 use yii\db\ExpressionBuilderTrait;
 use yii\db\ExpressionInterface;
@@ -66,7 +67,7 @@ public function build(ExpressionInterface $expression, array &$params = [])
             $column = $column->current();
         }
 
-        if ($column instanceof ExpressionInterface) {
+        if ($column instanceof Expression) {
             $column = $column->expression;
         }
 
@@ -128,7 +129,7 @@ protected function buildValues(ConditionInterface $condition, $values, &$params)
             $column = $column->current();
         }
 
-        if ($column instanceof ExpressionInterface) {
+        if ($column instanceof Expression) {
             $column = $column->expression;
         }
 
@@ -163,7 +164,7 @@ protected function buildSubqueryInCondition($operator, $columns, $values, &$para
 
         if (is_array($columns)) {
             foreach ($columns as $i => $col) {
-                if ($col instanceof ExpressionInterface) {
+                if ($col instanceof Expression) {
                     $col = $col->expression;
                 }
                 if (strpos($col, '(') === false) {
@@ -174,7 +175,7 @@ protected function buildSubqueryInCondition($operator, $columns, $values, &$para
             return '(' . implode(', ', $columns) . ") $operator $sql";
         }
 
-        if ($columns instanceof ExpressionInterface) {
+        if ($columns instanceof Expression) {
             $columns = $columns->expression;
         }
         if (strpos($columns, '(') === false) {
@@ -199,7 +200,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
         foreach ($values as $value) {
             $vs = [];
             foreach ($columns as $column) {
-                if ($column instanceof ExpressionInterface) {
+                if ($column instanceof Expression) {
                     $column = $column->expression;
                 }
                 if (isset($value[$column])) {
@@ -217,7 +218,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
 
         $sqlColumns = [];
         foreach ($columns as $i => $column) {
-            if ($column instanceof ExpressionInterface) {
+            if ($column instanceof Expression) {
                 $column = $column->expression;
             }
             $sqlColumns[] = strpos($column, '(') === false ? $this->queryBuilder->db->quoteColumnName($column) : $column;

diff --git a/framework/db/mssql/conditions/InConditionBuilder.php b/framework/db/mssql/conditions/InConditionBuilder.php
@@ -8,7 +8,7 @@
 namespace yii\db\mssql\conditions;
 
 use yii\base\NotSupportedException;
-use yii\db\ExpressionInterface;
+use yii\db\Expression;
 
 /**
  * {@inheritdoc}
@@ -38,7 +38,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
     {
         $quotedColumns = [];
         foreach ($columns as $i => $column) {
-            if ($column instanceof ExpressionInterface) {
+            if ($column instanceof Expression) {
                 $column = $column->expression;
             }
             $quotedColumns[$i] = strpos($column, '(') === false ? $this->queryBuilder->db->quoteColumnName($column) : $column;
@@ -47,7 +47,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
         foreach ($values as $value) {
             $vs = [];
             foreach ($columns as $i => $column) {
-                if ($column instanceof ExpressionInterface) {
+                if ($column instanceof Expression) {
                     $column = $column->expression;
                 }
                 if (isset($value[$column])) {

diff --git a/framework/db/sqlite/conditions/InConditionBuilder.php b/framework/db/sqlite/conditions/InConditionBuilder.php
@@ -8,7 +8,7 @@
 namespace yii\db\sqlite\conditions;
 
 use yii\base\NotSupportedException;
-use yii\db\ExpressionInterface;
+use yii\db\Expression;
 
 /**
  * {@inheritdoc}
@@ -38,7 +38,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
     {
         $quotedColumns = [];
         foreach ($columns as $i => $column) {
-            if ($column instanceof ExpressionInterface) {
+            if ($column instanceof Expression) {
                 $column = $column->expression;
             }
             $quotedColumns[$i] = strpos($column, '(') === false ? $this->queryBuilder->db->quoteColumnName($column) : $column;
@@ -47,7 +47,7 @@ protected function buildCompositeInCondition($operator, $columns, $values, &$par
         foreach ($values as $value) {
             $vs = [];
             foreach ($columns as $i => $column) {
-                if ($column instanceof ExpressionInterface) {
+                if ($column instanceof Expression) {
                     $column = $column->expression;
                 }
                 if (isset($value[$column])) {