Merge branch 'release/0.2.8'

Author: cdtweb

README.md

@@ -128,6 +128,8 @@ if(!$validator->validate()){
 * `ipv6` Validate that value is IPv6
 * `date`, `datetime` Validate that value is date/datetime
 
+**Hint:** You can add `[]` to the end of any type to validate an array of values.
+
 #### Validator Methods
 
 ##### `__construct(array $values, array $rules)`

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "nonamephp/php7-common",
     "description": "A collection of common PHP 7 libraries",
-    "version": "0.2.7",
+    "version": "0.2.8",
     "license": "MIT",
     "authors": [
         {

src/Validator.php

@@ -243,6 +243,9 @@ public function validate() : bool
                     $rule['required'] = true;
                 }
 
+                // Add key/name to $rule
+                $rule['name'] = $name;
+
                 // Check if value exists
                 if ($value = $this->values->get($name, false)) {
                     // Validate using type validators
@@ -328,9 +331,32 @@ public function hasErrors() : bool
     public function validateType($type, $value, array $rule = []) : bool
     {
         $type = strtolower($type);
+
+        // Check for type[]
+        $arrayType = (substr($type, -2) == '[]');
+        if ($arrayType) {
+            $type = substr($type, 0, -2);
+        }
+
         if (isset($this->typeValidateFunctionMap[$type])) {
+            if ($arrayType) {
+                // Validate an array of values
+                $values = (array) $value;
+                foreach ($values as $index => $value) {
+                    if (!$this->{$this->typeValidateFunctionMap[$type]}($value, $rule)) {
+                        $this->setError($rule['name'], "'$value' failed to validate as '$type'");
+                    }
+                }
+
+                // Return true regardless of any errors to avoid default error
+                // that is set when this method returns false
+                return true;
+            }
+
+            // Validate the value
             return $this->{$this->typeValidateFunctionMap[$type]}($value, $rule);
         }
+
         throw new \InvalidArgumentException("Type '$type' is not a valid rule type");
     }
 

tests/ValidatorTest.php

@@ -786,4 +786,34 @@ public function testCustomValidatorRule()
             }
         }
     }
+
+    /**
+     * Test type[] validation
+     */
+    public function testValidateArrayTypes()
+    {
+        $passValues = [
+            'strings' => $this->stringValues,
+            'integers' => $this->integerValues,
+            'emails' => $this->emailValues
+        ];
+
+        $failValues = [
+            'strings' => array_merge($this->stringValues, $this->integerValues),
+            'integers' => array_merge($this->integerValues, $this->stringValues, $this->emailValues),
+            'emails' => array_merge($this->emailValues, $this->stringValues, $this->integerValues)
+        ];
+
+        $rules = [
+            'strings' => 'string[]',
+            'integers' => 'int[]',
+            'emails' => 'email[]'
+        ];
+
+        $passValidator = new Validator($passValues, $rules);
+        $this->assertTrue($passValidator->validate());
+
+        $failValidator = new Validator($failValues, $rules);
+        $this->assertFalse($failValidator->validate());
+    }
 }