CHANGELOG.md

@@ -9,4 +9,8 @@
 ### Changed
 - 拆分 validate 及消息处理为 trait
 - extend 的 callback 类作用域取消绑定到 Validator 示例. validate 函数参数增加传入 Validator 实例
-- validate 从 protected 改为 publish
+- validate 从 protected 改为 publish
+
+## [v1.0.1] - 2019-03-04
+### Added
+- 增加支持通过魔术方法调用扩展规则

src/Validator.php

@@ -7,6 +7,7 @@
 
 namespace Runner\Validator;
 
+use BadMethodCallException;
 use Runner\Validator\Concerns\MessagesAttributes;
 use Runner\Validator\Concerns\ValidatesAttributes;
 
@@ -88,14 +89,13 @@ public function validate()
             if ($this->hasField($field)) {
                 $value = $this->getField($field);
                 foreach ($rules as $rule => $parameters) {
-                    if (!$this->runValidateRule($field, $value, $rule, $parameters)) {
+                    if (!$this->runValidateRule($rule, $field, $value, $parameters)) {
                         $this->messages[$field][$rule] = $this->buildMessage($rule, $field, $parameters);
                     }
                 }
             } elseif ($forceRules = array_intersect(self::$forceRules, array_keys($rules))) {
-                $value = null;
                 foreach ($forceRules as $rule) {
-                    if (!$this->runValidateRule($field, null, $rule, $rules[$rule])) {
+                    if (!$this->runValidateRule($rule, $field, null, $rules[$rule])) {
                         $this->messages[$field][$rule] = $this->buildMessage($rule, $field, $rules[$rule]);
                     }
                 }
@@ -143,7 +143,6 @@ protected function parseRules(array $ruleGroups)
                 $this->ruleGroups[$field][$rule] = ('' === $parameters ? [] : explode(',', $parameters));
             }
         }
-        unset($map);
     }
 
     /**
@@ -213,10 +212,21 @@ protected function getField($field)
      *
      * @return bool
      */
-    protected function runValidateRule($field, $value, $rule, array $parameters = [])
+    protected function runValidateRule($rule, $field, $value, array $parameters = [])
     {
         $callback = array_key_exists($rule, self::$extensions) ? self::$extensions[$rule] : [$this, "validate{$rule}"];
 
         return (bool) call_user_func($callback, $field, $value, $parameters, $this);
     }
+
+    public function __call($method, $arguments)
+    {
+        $rule = self::formatRuleName(substr($method, 8));
+
+        if (!isset(self::$extensions[$rule])) {
+            throw new BadMethodCallException(sprintf('Method %s::%s does not exists', static::class, $method));
+        }
+
+        return $this->runValidateRule($rule, ...$arguments);
+    }
 }

src/messages/en.php

@@ -6,25 +6,25 @@
  */
 
 return [
-    'Required'   => 'is required',
-    'Accepted'   => 'must be accepted',
-    'Numeric'    => 'must be numeric',
-    'Integer'    => 'must be an integer',
-    'Float'      => 'must be a float',
-    'Size'       => "'s size must be %s",
-    'Min'        => 'must be at least %d',
-    'Max'        => 'must be no more than %d',
-    'In'         => 'contains invalid value',
-    'Ip'         => 'is not a valid IP address',
-    'Email'      => 'is not a valid email address',
-    'Url'        => 'is not a valid URL',
-    'Regex'      => 'contains invalid characters',
-    'Date'       => 'is not a valid date',
+    'Required' => 'is required',
+    'Accepted' => 'must be accepted',
+    'Numeric' => 'must be numeric',
+    'Integer' => 'must be an integer',
+    'Float' => 'must be a float',
+    'Size' => "'s size must be %s",
+    'Min' => 'must be at least %d',
+    'Max' => 'must be no more than %d',
+    'In' => 'contains invalid value',
+    'Ip' => 'is not a valid IP address',
+    'Email' => 'is not a valid email address',
+    'Url' => 'is not a valid URL',
+    'Regex' => 'contains invalid characters',
+    'Date' => 'is not a valid date',
     'DateFormat' => "must be date with format '%s'",
-    'Boolean'    => 'must be a boolean',
-    'Range'      => 'must be between %d and %d characters',
-    'Confirm'    => 'must be same as %s field',
-    'Array'      => 'must be an array',
-    'String'     => 'must be a string',
-    'Json'       => 'must be a json string',
+    'Boolean' => 'must be a boolean',
+    'Range' => 'must be between %d and %d characters',
+    'Confirm' => 'must be same as %s field',
+    'Array' => 'must be an array',
+    'String' => 'must be a string',
+    'Json' => 'must be a json string',
 ];

tests/ValidatorTest.php

@@ -89,6 +89,32 @@ function () {
         );
     }
 
+    public function testAddExtension()
+    {
+        Validator::addExtension('runner', function () {
+            return true;
+        });
+
+        $data = [
+            'a' => 'string',
+        ];
+
+        $validator = new Validator($data, [
+            'a' => 'runner'
+        ]);
+
+        $this->assertSame(true, $validator->validate());
+
+        $this->assertSame(true, $validator->validateRunner('a', 'a', []));
+
+        $validator = new Validator($data, [
+            'a' => 'demo',
+        ]);
+
+        $this->expectException(BadMethodCallException::class);
+        $validator->validate();
+    }
+
     public function testReplaceMessage()
     {
         $validator = new Validator(