Add basic rule parameters for array

Author: cdtweb

src/Validator.php

@@ -582,7 +582,25 @@ protected function validateScalar($value, array $rule = []): bool
      */
     protected function validateArray($value, array $rule = []): bool
     {
-        return is_array($value);
+        $valid = is_array($value);
+
+        if (isset($rule['allow_empty']) && $rule['allow_empty'] === false) {
+            $valid = $valid && !empty($value);
+        }
+
+        if (isset($rule['count']) && is_int($rule['count'])) {
+            $valid = $valid && (count($value) == $rule['count']);
+        }
+
+        if (isset($rule['min_count']) && is_int($rule['min_count'])) {
+            $valid = $valid && (count($value) >= $rule['min_count']);
+        }
+
+        if (isset($rule['max_count']) && is_int($rule['max_count'])) {
+            $valid = $valid && (count($value) <= $rule['max_count']);
+        }
+
+        return $valid;
     }
 
     /**
@@ -624,11 +642,11 @@ protected function validateString($value, array $rule = []): bool
             $valid = $valid || is_null($value);
         }
 
-        if (isset($rule['min_length']) && is_int($rule['min_length']) && $rule['min_length'] > 0) {
+        if (isset($rule['min_length']) && is_int($rule['min_length'])) {
             $valid = $valid && (strlen($value) >= $rule['min_length']);
         }
 
-        if (isset($rule['max_length']) && is_int($rule['max_length']) && $rule['max_length'] > 0) {
+        if (isset($rule['max_length']) && is_int($rule['max_length'])) {
             $valid = $valid && (strlen($value) <= $rule['max_length']);
         }
 
@@ -670,14 +688,14 @@ protected function validateInteger($value, array $rule = []): bool
         // Validate > or >=, with > getting priority over >=
         if (isset($rule['>']) && is_int($rule['>'])) {
             $valid = $valid && ($value > $rule['>']);
-        } elseif(isset($rule['>=']) && is_int($rule['>='])) {
+        } elseif (isset($rule['>=']) && is_int($rule['>='])) {
             $valid = $valid && ($value >= $rule['>=']);
         }
 
         // Validate < or <=, with < getting priority over <=
         if (isset($rule['<']) && is_int($rule['<'])) {
             $valid = $valid && ($value < $rule['<']);
-        } elseif(isset($rule['<=']) && is_int($rule['<='])) {
+        } elseif (isset($rule['<=']) && is_int($rule['<='])) {
             $valid = $valid && ($value <= $rule['<=']);
         }
 
@@ -806,18 +824,26 @@ protected function validateDateTime($value, array $rule = []): bool
         }
 
         $value = (string) $value;
+        $compare = $value;
+
+        if(strlen($compare) == 4){
+            // Value is presumably a 4-digit year (e.g. 2016) and as-is doesn't
+            // play nice with strtotime() or date_create()
+            $compare .= "-01-01";
+        }
 
         // Returns a timestamp on success, FALSE otherwise
-        if (($time = strtotime($value)) === false) {
+        if (($time = strtotime($compare)) === false) {
             return false;
         }
 
         // Returns new \DateTime instance on success, FALSE otherwise
-        if (($date = date_create($value)) === false) {
+        if (($date = date_create($compare)) === false) {
             return false;
         }
 
         if (isset($rule['format'])) {
+            // Use original value for comparing format
             return $date->format($rule['format']) == $value;
         }
 

tests/ValidatorTest.php

@@ -534,6 +534,21 @@ public function testValidateArray()
                 Validator::isArray($value)
             );
         }
+
+        // Test array rules
+        $arr_count = ['count' => 3];
+        $arr_min_count = ['min_count' => 3];
+        $arr_max_count = ['max_count' => 3];
+        $arr_allow_empty = ['allow_empty' => false];
+
+        $this->assertTrue(Validator::isArray([1,2,3], $arr_count));
+        $this->assertFalse(Validator::isArray([1], $arr_count));
+        $this->assertTrue(Validator::isArray([1,2,3,4,5], $arr_min_count));
+        $this->assertFalse(Validator::isArray([1,2], $arr_min_count));
+        $this->assertTrue(Validator::isArray([1,2,3], $arr_max_count));
+        $this->assertFalse(Validator::isArray([1,2,3,4], $arr_max_count));
+        $this->assertTrue(Validator::isArray([1,2,3], $arr_allow_empty));
+        $this->assertFalse(Validator::isArray([], $arr_allow_empty));
     }
 
     /**