Merge remote-tracking branch 'local/MC-39477' into PRodubovyk20201222

Author: Oleksandr Dubovyk

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -838,7 +838,7 @@ public function validateAttribute($validatedValue)
                         }
                     }
                 } elseif (is_array($value)) {
-                    if (!is_array($validatedValue)) {
+                    if (!is_array($validatedValue) || empty($validatedValue)) {
                         return false;
                     }
                     $result = array_intersect($value, $validatedValue);

app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php

@@ -91,6 +91,10 @@ public function validateAttributeDataProvider()
             [1, '>=', '1', true],
             [1, '>=', 0, false],
             [0, '<', [1], false],
+
+            [[1], '!{}', [], false],
+            [[1], '!{}', [1], false],
+            [[1], '!{}', [0], false],
         ];
     }
 
@@ -176,6 +180,8 @@ public function validateAttributeArrayInputTypeDataProvider()
             [[3], '{}', [], false, 'grid'],
             [1, '{}', 1, false, 'grid'],
             [1, '!{}', [1, 2, 3], false, 'grid'],
+            [1, '!{}', [], false, 'grid'],
+            [[1], '!{}', [], false, 'grid'],
             [[1], '{}', null, false, 'grid'],
             [null, '{}', null, true, 'input'],
             [null, '!{}', null, false, 'input'],