Merge pull request #335 from Wixel/fix-315

Fixes issue #315

Author: filisko

gump.class.php

@@ -537,7 +537,7 @@ private function field_has_required_rules(array $rules)
     {
         $require_type_of_rules = ['required', 'required_file'];
 
-        // v2
+        // v2 format (using arrays for definition of rules)
         if (is_array($rules) && is_array($rules[0])) {
             $found = array_filter($rules, function ($item) use ($require_type_of_rules) {
                 return in_array($item[0], $require_type_of_rules);
@@ -583,10 +583,20 @@ private static function filter_to_method(string $rule)
      */
     private function foreach_call_validator(string $rule, string $field, array $input, array $rule_params = [])
     {
-        $values = !is_array($input[$field]) ? [ $input[$field] ] : $input[$field];
+        $is_required_kind_of_rule = $this->field_has_required_rules([$rule]);
+
+        // Fixes #315
+        if ($is_required_kind_of_rule && is_array($input[$field]) && count($input[$field]) === 0) {
+            $result = $this->call_validator($rule, $field, $input, $rule_params, $input[$field]);
+
+            return is_array($result) ? $result : true;
+        }
+
+        $values = is_array($input[$field]) ? $input[$field] : [ $input[$field] ];
 
         foreach ($values as $value) {
             $result = $this->call_validator($rule, $field, $input, $rule_params, $value);
+
             if (is_array($result)) {
                 return $result;
             }

tests/RunTest.php

@@ -132,4 +132,4 @@ public function testNestedArrays()
             'field2.*.name' => 'The Field2.*.name field is required'
         ], $this->gump->get_errors_array());
     }
-}
+}

tests/Validators/MaxNumericValidatorTest.php

@@ -32,4 +32,4 @@ public function testWhenInputIsEmptyAndNotRequiredIsSuccess()
     {
          $this->assertTrue($this->validate('max_numeric,2', ''));
     }
-}
+}

tests/Validators/MinAgeValidatorTest.php

@@ -17,8 +17,6 @@ class MinAgeValidatorTest extends BaseTestCase
 {
     public function testSameDayAsBirthdayIsSuccess()
     {
-
-
         $this->helpersMock->shouldReceive('date')
             ->once()
             ->with('Y-m-d', 866419200)
@@ -41,8 +39,6 @@ public function testSameDayAsBirthdayIsSuccess()
 
     public function testOneDayAfterBirthdayIsSuccess()
     {
-
-
         $this->helpersMock->shouldReceive('date')
             ->once()
             ->with('Y-m-d', 866419200)
@@ -107,4 +103,4 @@ public function testWhenInputIsEmptyAndNotRequiredIsSuccess()
 
         $this->assertTrue($result);
     }
-}
+}

tests/Validators/RequiredValidatorTest.php

@@ -46,6 +46,7 @@ public function errorProvider()
         return [
             [''],
             [null],
+            [[]],
         ];
     }
 
@@ -87,4 +88,4 @@ public function testRequiredValidatorsReturnRightErrorStructureWhenFieldIsPresen
             'params' => []
         ]], $result);
     }
-}
+}

tests/Validators/ValidArraySizeEqualValidatorTest.php

@@ -32,6 +32,6 @@ public function testWhenLesserIsFailure()
 
     public function testWhenInputIsEmptyAndNotRequiredIsSuccess()
     {
-         $this->assertTrue($this->validate(self::RULE, ''));
+         $this->assertTrue($this->validate(self::RULE, []));
     }
-}
+}

tests/Validators/ValidArraySizeGreaterValidatorTest.php

@@ -32,6 +32,21 @@ public function testWhenLesserIsFailure()
 
     public function testWhenInputIsEmptyAndNotRequiredIsSuccess()
     {
-         $this->assertTrue($this->validate(self::RULE, ''));
+         $this->assertTrue($this->validate(self::RULE, []));
     }
-}
+
+    public function testWhenInputIsEmptyAndRequiredIsError()
+    {
+         $this->assertEquals(
+             $this->validate('required|'.self::RULE, []),
+             [
+                 [
+                     'field' => 'test',
+                     'value' => [],
+                     'rule' => 'required',
+                     'params' => []
+                 ]
+             ]
+         );
+    }
+}

tests/Validators/ValidArraySizeLesserValidatorTest.php

@@ -32,6 +32,6 @@ public function testWhenGreaterIsFailure()
 
     public function testWhenInputIsEmptyAndNotRequiredIsSuccess()
     {
-         $this->assertTrue($this->validate(self::RULE, ''));
+         $this->assertTrue($this->validate(self::RULE, []));
     }
-}
+}