Fix Hash::_mathces miss comparison 0 with string-value

cakephp · Feb 5, 2018 · e70013f · e70013f
1 parent 1dd631b
commit e70013f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -267,15 +267,17 @@ protected static function _matches($data, $selector)
                 $prop = $prop ? '1' : '0';
             } elseif ($isBool) {
                 $prop = $prop ? 'true' : 'false';
+            } elseif (is_numeric($prop)) {
+                $prop = (string)$prop;
             }
 
             // Pattern matches and other operators.
             if ($op === '=' && $val && $val[0] === '/') {
                 if (!preg_match($val, $prop)) {
                     return false;
                 }
-            } elseif (($op === '=' && $prop != $val) ||
-                ($op === '!=' && $prop == $val) ||
+            } elseif (($op === '=' && $prop !== $val) ||
+                ($op === '!=' && $prop === $val) ||
                 ($op === '>' && $prop <= $val) ||
                 ($op === '<' && $prop >= $val) ||
                 ($op === '>=' && $prop < $val) ||