Merge branch 'ACP2E-2269' of https://github.com/magento-l3/magento2ce into PR-VK-2023-09-29

Author: vkolesny

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

@@ -885,16 +885,15 @@ public function validateAttribute($validatedValue)
      */
     protected function _compareValues($validatedValue, $value, $strict = true)
     {
-        if (null === $value || null === $validatedValue ||
-            $strict && is_numeric($validatedValue) && is_numeric($value)) {
+        if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
             return $validatedValue == $value;
         }
 
         $validatePattern = preg_quote((string) $validatedValue, '~');
         if ($strict) {
             $validatePattern = '^' . $validatePattern . '$';
         }
-        return (bool)preg_match('~' . $validatePattern . '~iu', $value);
+        return (bool)preg_match('~' . $validatePattern . '~iu', (string)$value);
     }
 
     /**

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

@@ -62,6 +62,8 @@ public function validateAttributeDataProvider()
             ['1', '==', 1, true],
             ['x', '==', 'x', true],
             ['x', '==', 0, false],
+            [null, '==', 0, false],
+            [null, '==', 0.00, false],
 
             [1, '!=', 1, false],
             [0, '!=', 1, true],