Merge pull request #14 from consatan/fix/multiple_rules_in_field_vald…

…ation fix: 一条规则多个验证器时验证结果错误
inhere · Aug 20, 2019 · 2426184 · 2426184
2 parents 5e1e643 + f3b58b0
commit 2426184
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Traits/MultipleRulesTrait.php b/src/Traits/MultipleRulesTrait.php
@@ -90,8 +90,7 @@ protected function collectRules(): ?Generator
                 $rules = is_array($rule[0]) ? $rule[0] : array_map('trim', explode('|', $rule[0]));
 
                 foreach ($rules as $aRule) {
-                    $rule = $this->parseRule($aRule, $rule);
-                    yield $field => $rule;
+                    yield $field => $this->parseRule($aRule, $rule);
                 }
             }
         }

diff --git a/test/FieldValidationTest.php b/test/FieldValidationTest.php
@@ -76,6 +76,11 @@ public function testValidateField(): void
         $this->assertCount(3, $errors);
         $this->assertSame('freeTime is required!!!!', $v->getErrors('freeTime')[0]);
 
+        $v = FieldValidation::check($this->data, [
+            ['goods.pear', 'required|int|min:30|max:60']
+        ]);
+        $this->assertTrue($v->isOk());
+
         $v = FieldValidation::check($this->data, [
             ['userId', 'required|int'],
             ['userId', 'min:1'],