Merge pull request #43 from rakit/strict-in-and-notin

Add method to enable strict checking for rules 'in' and 'not_in'

Author: emsifa

README.md

@@ -417,11 +417,29 @@ The field under this rule may have alpha-numeric characters, as well as dashes a
 
 The field under this rule must be included in the given list of values.
 
+This rule is using `in_array` to check the value. 
+By default `in_array` disable strict checking. 
+So it doesn't check data type.
+If you want enable strict checking, you can invoke validator like this:
+
+```php
+$validation = $validator->validate($data, [
+    'enabled' => [
+        'required', 
+        $validator('in', [true, 1])->strict()
+    ]
+]);
+```
+
+Then 'enabled' value should be boolean `true`, or int `1`.
+
 <a id="rule-not_in"></a>
 #### not_in:value_1,value_2,...
 
 The field under this rule must not be included in the given list of values.
 
+This rule also using `in_array`. You can enable strict checking by invoking validator and call `strict()` like example in rule `in` above.
+
 <a id="rule-min"></a>
 #### min:number
 

src/Rules/In.php

@@ -9,6 +9,8 @@ class In extends Rule
 
     protected $message = "The :attribute is not allowing :value";
 
+    protected $strict = false;
+
     public function fillParameters(array $params)
     {
         if (count($params) == 1 AND is_array($params[0])) {
@@ -18,12 +20,17 @@ public function fillParameters(array $params)
         return $this;
     }
 
+    public function strict($strict = true)
+    {
+        $this->strict = $strict;
+    }
+
     public function check($value)
     {
         $this->requireParameters(['allowed_values']);
 
         $allowed_values = $this->parameter('allowed_values');
-        return in_array($value, $allowed_values);
+        return in_array($value, $allowed_values, $this->strict);
     }
 
 }

src/Rules/NotIn.php

@@ -9,6 +9,8 @@ class NotIn extends Rule
 
     protected $message = "The :attribute is not allowing :value";
 
+    protected $strict = false;
+
     public function fillParameters(array $params)
     {
         if (count($params) == 1 AND is_array($params[0])) {
@@ -18,11 +20,16 @@ public function fillParameters(array $params)
         return $this;
     }
 
+    public function strict($strict = true)
+    {
+        $this->strict = $strict;
+    }
+
     public function check($value)
     {
         $this->requireParameters(['disallowed_values']);
         $disallowed_values = (array) $this->parameter('disallowed_values');
-        return !in_array($value, $disallowed_values);
+        return !in_array($value, $disallowed_values, $this->strict);
     }
 
 }

tests/Rules/InTest.php

@@ -21,4 +21,16 @@ public function testInvalids()
         $this->assertFalse($this->rule->fillParameters([1,2,3])->check(4));
     }
 
+    public function testStricts()
+    {
+        // Not strict
+        $this->assertTrue($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+        $this->assertTrue($this->rule->fillParameters(['1', '2', '3'])->check(true));
+
+        // Strict        
+        $this->rule->strict();
+        $this->assertFalse($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+        $this->assertFalse($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+    }
+
 }

tests/Rules/NotInTest.php

@@ -21,4 +21,16 @@ public function testInvalids()
         $this->assertFalse($this->rule->fillParameters(['bar', 'baz', 'qux'])->check('bar'));
     }
 
+    public function testStricts()
+    {
+        // Not strict
+        $this->assertFalse($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+        $this->assertFalse($this->rule->fillParameters(['1', '2', '3'])->check(true));
+
+        // Strict        
+        $this->rule->strict();
+        $this->assertTrue($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+        $this->assertTrue($this->rule->fillParameters(['1', '2', '3'])->check(1));        
+    }
+
 }