fix where parser for 7.2

sitkoru · Mar 30, 2018 · 055dfb4 · 055dfb4
1 parent ce0a7af
commit 055dfb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/WhereParser.php b/WhereParser.php
@@ -139,7 +139,7 @@ public function parseInCondition($operator, $operands, &$params)
             throw new Exception("Operator '$operator' requires two operands.");
         }
 
-        list($column, $values) = $operands;
+        [$column, $values] = $operands;
 
         if ($values === [] || $column === []) {
             return $operator === 'IN' ? '0=1' : '';
@@ -150,16 +150,16 @@ public function parseInCondition($operator, $operands, &$params)
         }
 
         $values = (array)$values;
-
-        if (is_array($column)) {
+        if (\is_array($column) && \count($column) > 1) {
+            return $this->parseCompositeInCondition($operator, $column, $values, $params);
+        }
+        if (\is_array($column)) {
             $column = reset($column);
-            if (\count($column) > 1) {
-                return $this->parseCompositeInCondition($operator, $column, $values, $params);
-            }
+
         }
         foreach ($values as $i => $value) {
-            if (is_array($value)) {
-                $value = array_key_exists($column, $value) ? $value[$column] : null;
+            if (\is_array($value)) {
+                $value = $value[$column] ?? null;
             }
             if ($value === null) {
                 $values[$i] = 'NULL';

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.1.0",
     "yiisoft/yii2-redis": "~2.0.6"
   },
   "autoload": {