bug fixed, some update

Author: inhere

README.md

@@ -481,7 +481,7 @@ public function get(string $key, $default = null)
 ----------|-------------|------------
 `int/integer`   | 验证是否是 int | `['userId', 'int']`
 `num/number`    | 验证是否是 number | `['userId', 'number']`
-`bool`  | 验证是否是 bool | `['open', 'bool']`
+`bool/boolean`  | 验证是否是 bool | `['open', 'bool']`
 `float` | 验证是否是 float | `['price', 'float']`
 `string`    | 验证是否是 string. 支持长度检查 | `['name', 'string']`, `['name', 'string', 'min'=>4, 'max'=>16]`
 `alpha`   | 验证值是否仅包含字母字符 | `['name', 'alpha']`
@@ -492,8 +492,7 @@ public function get(string $key, $default = null)
 `isList`   | 验证值是否是一个自然数组 list (key是从0自然增长的) | `['tags', 'isList']`
 `intList`   | 验证字段值是否是一个 int list | `['tagIds', 'intList']`
 `strList`   | 验证字段值是否是一个 string list | `['tags', 'strList']`
-`size`  | 验证大小范围, 可以支持验证 `int`, `string`, `array` 数据类型 | `['tagId', 'size', 'min'=>4, 'max'=>567]`
-`range`  | `size` 验证的别名 | 跟 `size` 一样
+`size/range`  | 验证大小范围, 可以支持验证 `int`, `string`, `array` 数据类型 | `['tagId', 'size', 'min'=>4, 'max'=>567]`
 `length`    | 长度验证（ 跟 `size`差不多, 但只能验证 `string`, `array` 的长度 | ....
 `min`   | 最小边界值验证 | `['title', 'min', 40]`
 `max`   | 最大边界值验证 | `['title', 'max', 40]`

examples/index.php

@@ -43,6 +43,8 @@
 
     ['goods.pear', 'max', 30], //
 
+    ['goods', 'isList'], //
+
      ['notExistsField1', 'requiredWithout', 'notExistsField2'], //
 //    ['notExistsField1', 'requiredWithout', 'existsField'], //
 

src/ValidationTrait.php

@@ -218,14 +218,14 @@ public function validate(array $onlyChecked = [], $stopOnError = null)
             foreach ($attrs as $attr) {
                 $value = $this->getValue($attr);
 
-                // mark attribute is safe. not need validate. like. 'created_at'
-                if ($validator === 'safe') {
-                    $this->_safeData[$attr] = $value;
+                // 不在需要检查的列表内
+                if ($onlyChecked && !in_array($attr, $onlyChecked, true)) {
                     continue;
                 }
 
-                // 不在需要检查的列表内
-                if ($onlyChecked && !in_array($attr, $onlyChecked, true)) {
+                // mark attribute is safe. not need validate. like. 'created_at'
+                if ($validator === 'safe') {
+                    $this->_safeData[$attr] = $value;
                     continue;
                 }
 
@@ -300,22 +300,23 @@ protected function requiredValidate($attr, $value, $validator, $args)
             $result = $this->required($attr);
 
             // 其他 required* 方法
-        } else {
+        } elseif (method_exists($this, $validator)) {
             // 压入当前属性/字段名
             array_unshift($args, $attr);
 
             $result = call_user_func_array([$this, $validator], $args);
-        }
-
-        // failed
-        if (!$result) {
-            return false;
+        } else {
+            throw new \InvalidArgumentException("The validator [$validator] is not exists!");
         }
 
         // validate success, save value to safeData
-        $this->collectSafeValue($attr, $value);
+        if ($result) {
+            $this->collectSafeValue($attr, $value);
 
-        return true;
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -364,14 +365,14 @@ protected function doValidate($data, $attr, $value, $validator, $args)
             throw new \InvalidArgumentException('Validator type is error, must is String or Closure!');
         }
 
-        if (!call_user_func_array($callback, $args)) {
-            return false;
-        }
-
         // validate success, save value to safeData
-        $this->collectSafeValue($attr, $value);
+        if (call_user_func_array($callback, $args)) {
+            $this->collectSafeValue($attr, $value);
 
-        return true;
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -456,6 +457,11 @@ protected function collectRules()
         // return $this->_availableRules;
     }
 
+    /**
+     * collect Safe Value
+     * @param string $attr
+     * @param mixed $value
+     */
     protected function collectSafeValue($attr, $value)
     {
         // 进行的是子级属性检查 eg: 'goods.apple'
@@ -720,6 +726,7 @@ public function lastError($onlyMsg = true)
         'num' => '{attr} must be an integer greater than 0!',
         'number' => '{attr} must be an integer greater than 0!',
         'bool' => '{attr} must be is boolean!',
+        'boolean' => '{attr} must be is boolean!',
         'float' => '{attr} must be is float!',
         'url' => '{attr} is not a url address!',
         'email' => '{attr} is not a email address!',
@@ -741,6 +748,10 @@ public function lastError($onlyMsg = true)
         'compare' => '{attr} must be equals to {value0}',
         'same' => '{attr} must be equals to {value0}',
         'isArray' => '{attr} must be an array',
+        'isMap' => '{attr} must be an array and is key-value format',
+        'isList' => '{attr} must be an array of nature',
+        'intList' => '{attr} must be an array and value is all integers',
+        'strList' => '{attr} must be an array and value is all strings',
         'json' => '{attr} must be an json string',
         'callback' => '{attr} don\'t pass the test and verify!',
         '_' => '{attr} validation is not through!',