Merge pull request #26 from xingshuwangluo/master

增加 闭包验证类 功能

README.md

@@ -324,6 +324,30 @@ $v = Validation::make($_POST,[
     }]
 ```
 
+- **方式4**定义一个闭包验证类进行验证,这种方法能提高验证方法的复用性
+
+> 别忘了继承 `\Inhere\Validate\Validator\AbstractValidator`,和实现必须方法`validate`
+
+```php
+
+class AdemoValidator extends \Inhere\Validate\Validator\AbstractValidator
+{
+
+
+    public function validate($value, $data): bool 
+    {
+        if ($value == 1) {
+            return true;
+        }
+        return false;
+    }
+
+}
+
+    ['status', new AdemoValidator()]
+```
+
+
 ## 一个完整的规则示例
 
 一个完整的规则示例, 包含了所有可添加的项。

src/Validator/AbstractValidator.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Inhere\Validate\Validator;
+
+abstract class AbstractValidator implements ValidatorInterface 
+{
+
+    /**
+     * 魔术方法,在试图函数式使用对象是调用
+     * @param type $value
+     * @param type $data
+     * @return bool
+     */
+    public function __invoke($value, $data): bool {
+        return (bool) $this->validate($value, $data);
+    }
+
+}

src/Validator/ValidatorInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Inhere\Validate\Validator;
+
+/**
+ *
+ * 验证器借口
+ */
+interface ValidatorInterface 
+{
+
+    /**
+     * 验证方法，进行验证返回bool类型
+     * @param type $value 当前值
+     * @param type $data 全部的值
+     * @return bool
+     */
+    public function validate($value, $data): bool;
+
+}

test/RuleValidationTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Runner\Version;
 use Throwable;
 use function version_compare;
+use Inhere\ValidateTest\Validator\AdemoValidatorTest as AdemoValidator;
 
 /**
  * Class RuleValidationTest
@@ -432,9 +433,32 @@ function () {
                 },
                 'msg' => 'userId check failure by closure!'
             ],
+
         ];
     }
 
+    /**
+     * 测试自定义验证器
+     */
+    public function testValidator()
+    {
+        $rule=[
+            [
+                'user',
+                new AdemoValidator(),
+                'msg' => 'userId check failure by closure!'
+            ],
+        ];
+        $data=[
+            'user'=>1
+        ];
+        $validation = Validation::makeAndValidate($data, $rule);
+        $this->assertTrue($validation->isOk());
+        $validation = Validation::makeAndValidate(['user'=>2], $rule);
+        $this->assertTrue($validation->isFail());
+    }
+
+
     public function testArrayValidate(): void
     {
         $data = [

test/Validator/AdemoValidatorTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Inhere\ValidateTest\Validator;
+
+/**
+ * Class ClassValidator
+ * @package Inhere\ValidateTest\Validator
+ */
+class AdemoValidatorTest extends \Inhere\Validate\Validator\AbstractValidator 
+{
+
+
+    public function validate($value, $data): bool 
+    {
+        if ($value == 1) {
+            return true;
+        }
+        return false;
+    }
+
+}