Merge remote-tracking branch 'origin/MC-22610' into 2.3-develop-pr86

Author: zakdma

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

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Rule\Model\Condition;
 

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

@@ -55,14 +55,14 @@ public function validateAttributeDataProvider()
             ['0', '==', 1, false],
             ['1', '==', 1, true],
             ['x', '==', 'x', true],
-            ['x', '==', '0', false],
+            ['x', '==', 0, false],
 
             [1, '!=', 1, false],
             [0, '!=', 1, true],
             ['0', '!=', 1, true],
             ['1', '!=', 1, false],
             ['x', '!=', 'x', false],
-            ['x', '!=', '0', true],
+            ['x', '!=', 0, true],
 
             [1, '==', [1], true],
             [1, '!=', [1], false],
@@ -164,15 +164,15 @@ public function validateAttributeArrayInputTypeDataProvider()
 
             [[1, 2, 3], '{}', '1', true, 'grid'],
             [[1, 2, 3], '{}', '8', false, 'grid'],
-            [[1, 2, 3], '{}', '5', false, 'grid'],
+            [[1, 2, 3], '{}', 5, false, 'grid'],
             [[1, 2, 3], '{}', [2, 3, 4], true, 'grid'],
             [[1, 2, 3], '{}', [4], false, 'grid'],
             [[3], '{}', [], false, 'grid'],
             [1, '{}', 1, false, 'grid'],
             [1, '!{}', [1, 2, 3], false, 'grid'],
             [[1], '{}', null, false, 'grid'],
-            ['null', '{}', 'null', true, 'input'],
-            ['null', '!{}', 'null', false, 'input'],
+            [null, '{}', null, true, 'input'],
+            [null, '!{}', null, false, 'input'],
             [null, '{}', [1], false, 'input'],
 
             [[1, 2, 3], '()', 1, true, 'select'],