Merge pull request rakit#49 from rakit/fix-min-max-rules

Fixing min and max rule for string type. This should fixes rakit#48 .

Author: emsifa

src/Rules/Max.php

@@ -19,7 +19,7 @@ public function check($value)
         if (is_int($value)) {
             return $value <= $max;
         } elseif(is_string($value)) {
-            return strlen($value) <= $max;
+            return mb_strlen($value, 'UTF-8') <= $max;
         } elseif(is_array($value)) {
             return count($value) <= $max;
         } else {

src/Rules/Min.php

@@ -19,7 +19,7 @@ public function check($value)
         if (is_int($value)) {
             return $value >= $min;
         } elseif(is_string($value)) {
-            return strlen($value) >= $min;
+            return mb_strlen($value, 'UTF-8') >= $min;
         } elseif(is_array($value)) {
             return count($value) >= $min;
         } else {

tests/Rules/MaxTest.php

@@ -15,6 +15,11 @@ public function testValids()
         $this->assertTrue($this->rule->fillParameters([200])->check(123));
         $this->assertTrue($this->rule->fillParameters([6])->check('foobar'));
         $this->assertTrue($this->rule->fillParameters([3])->check([1,2,3]));
+
+        $this->assertTrue($this->rule->fillParameters([3])->check('мин'));
+        $this->assertTrue($this->rule->fillParameters([4])->check('كلمة'));
+        $this->assertTrue($this->rule->fillParameters([3])->check('ワード'));
+        $this->assertTrue($this->rule->fillParameters([1])->check('字'));
     }
 
     public function testInvalids()

tests/Rules/MinTest.php

@@ -21,7 +21,12 @@ public function testInvalids()
     {
         $this->assertFalse($this->rule->fillParameters([7])->check('foobar'));
         $this->assertFalse($this->rule->fillParameters([4])->check([1,2,3]));
-        $this->assertFalse($this->rule->fillParameters([200])->check(123));
+        $this->assertFalse($this->rule->fillParameters([200])->check(123));  
+
+        $this->assertFalse($this->rule->fillParameters([4])->check('мин'));
+        $this->assertFalse($this->rule->fillParameters([5])->check('كلمة'));
+        $this->assertFalse($this->rule->fillParameters([4])->check('ワード'));
+        $this->assertFalse($this->rule->fillParameters([2])->check('字'));      
     }
 
 }

tests/ValidatorTest.php

@@ -909,10 +909,16 @@ public function testGetValidData()
                     'qty' => 'invalid'
                 ]
             ],
+            'emails' => [
+                '[email protected]',
+                'something',
+                '[email protected]'
+            ],
             'thing' => 'exists',
         ], [
             'thing' => 'required',
             'items.*.product_id' => 'required|numeric',
+            'emails.*' => 'required|email',
             'items.*.qty' => 'required|numeric',
             'something' => 'default:on|required|in:on,off'
         ]);
@@ -925,6 +931,10 @@ public function testGetValidData()
                     'product_id' => 1
                 ]
             ],
+            'emails' => [
+                0 => '[email protected]',
+                2 => '[email protected]'
+            ],
             'thing' => 'exists',
             'something' => 'on'
         ], $validData);
@@ -939,10 +949,16 @@ public function testGetInvalidData()
                     'qty' => 'invalid'
                 ]
             ],
+            'emails' => [
+                '[email protected]',
+                'something',
+                '[email protected]'
+            ],
             'thing' => 'exists',
         ], [
             'thing' => 'required',
             'items.*.product_id' => 'required|numeric',
+            'emails.*' => 'required|email',
             'items.*.qty' => 'required|numeric',
             'something' => 'required|in:on,off'
         ]);
@@ -955,6 +971,9 @@ public function testGetInvalidData()
                     'qty' => 'invalid'
                 ]
             ],
+            'emails' => [
+                1 => 'something'
+            ],
             'something' => null
         ], $invalidData);
     }