Added strict checks to Validation::comparison().

cakephp · Jan 4, 2018 · 37bc151 · 37bc151
1 parent 95b48c6
commit 37bc151
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -295,6 +295,18 @@ public static function comparison($check1, $operator, $check2)
                     return true;
                 }
                 break;
+            case 'sameas':
+            case '===':
+                if ($check1 === $check2) {
+                    return true;
+                }
+                break;
+            case 'notsameas':
+            case '!==':
+                if ($check1 !== $check2) {
+                    return true;
+                }
+                break;
             default:
                 static::$errors[] = 'You must define the $operator parameter for Validation::comparison()';
         }
@@ -314,7 +326,7 @@ public static function comparison($check1, $operator, $check2)
      */
     public static function compareWith($check, $field, $context)
     {
-        return self::compareFields($check, $field, 'equalto', $context);
+        return self::compareFields($check, $field, '===', $context);
     }
 
     /**

diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
@@ -983,7 +983,7 @@ public function sameAs($field, $secondField, $message = null, $when = null)
         $extra = array_filter(['on' => $when, 'message' => $message]);
 
         return $this->add($field, 'sameAs', $extra + [
-            'rule' => ['compareFields', $secondField, 'equalto']
+            'rule' => ['compareFields', $secondField, '===']
         ]);
     }
 
@@ -1004,7 +1004,7 @@ public function notSameAs($field, $secondField, $message = null, $when = null)
         $extra = array_filter(['on' => $when, 'message' => $message]);
 
         return $this->add($field, 'notSameAs', $extra + [
-            'rule' => ['compareFields', $secondField, 'notequal']
+            'rule' => ['compareFields', $secondField, '!==']
         ]);
     }
 

diff --git a/tests/TestCase/Validation/ValidationTest.php b/tests/TestCase/Validation/ValidationTest.php
@@ -855,6 +855,10 @@ public function testComparison()
         $this->assertTrue(Validation::comparison(7, '==', 7));
         $this->assertTrue(Validation::comparison(7, 'not equal', 6));
         $this->assertTrue(Validation::comparison(7, '!=', 6));
+        $this->assertTrue(Validation::comparison(7, 'same as', 7));
+        $this->assertTrue(Validation::comparison(7, '===', 7));
+        $this->assertTrue(Validation::comparison(7, 'not same as', '7'));
+        $this->assertTrue(Validation::comparison(7, '!==', '7'));
         $this->assertFalse(Validation::comparison(6, 'is greater', 7));
         $this->assertFalse(Validation::comparison(6, '>', 7));
         $this->assertFalse(Validation::comparison(7, 'is less', 6));
@@ -869,6 +873,10 @@ public function testComparison()
         $this->assertFalse(Validation::comparison(7, '==', 6));
         $this->assertFalse(Validation::comparison(7, 'not equal', 7));
         $this->assertFalse(Validation::comparison(7, '!=', 7));
+        $this->assertFalse(Validation::comparison(7, 'same as', '7'));
+        $this->assertFalse(Validation::comparison(7, '===', '7'));
+        $this->assertFalse(Validation::comparison(7, 'not same as', 7));
+        $this->assertFalse(Validation::comparison(7, '!==', 7));
 
         $this->assertTrue(Validation::comparison('6.5', '!=', 6));
         $this->assertTrue(Validation::comparison('6.5', '<', 7));

diff --git a/tests/TestCase/Validation/ValidatorTest.php b/tests/TestCase/Validation/ValidatorTest.php
@@ -1425,7 +1425,7 @@ public function testNotEquals()
     public function testSameAs()
     {
         $validator = new Validator();
-        $this->assertProxyMethod($validator, 'sameAs', 'other', ['other', 'equalto'], 'compareFields');
+        $this->assertProxyMethod($validator, 'sameAs', 'other', ['other', '==='], 'compareFields');
         $this->assertNotEmpty($validator->errors(['username' => 'foo']));
     }
 
@@ -1437,7 +1437,7 @@ public function testSameAs()
     public function testNotSameAs()
     {
         $validator = new Validator();
-        $this->assertProxyMethod($validator, 'notSameAs', 'other', ['other', 'notequal'], 'compareFields');
+        $this->assertProxyMethod($validator, 'notSameAs', 'other', ['other', '!=='], 'compareFields');
         $this->assertNotEmpty($validator->errors(['username' => 'foo', 'other' => 'foo']));
     }