update, add new validator: enum. add test

Author: inhere

README.md

@@ -499,6 +499,8 @@ public function get(string $key, $default = null)
 
 ## 内置的验证器
 
+> `/` 分隔的验证器，表明功能是一样的，只是有不同的别名
+
 验证器 | 说明 | 规则示例
 ----------|-------------|------------
 `int/integer`   | 验证是否是 int | `['userId', 'int']`
@@ -520,7 +522,7 @@ public function get(string $key, $default = null)
 `max`   | 最大边界值验证 | `['title', 'max', 40]`
 `size/range/between`  | 验证大小范围, 可以支持验证 `int`, `string`, `array` 数据类型 | `['tagId', 'size', 'min'=>4, 'max'=>567]`
 `length`    | 长度验证（ 跟 `size`差不多, 但只能验证 `string`, `array` 的长度 | `['username', 'length', 'min' => 5, 'max' => 20]`
-`in`    | 枚举验证 | `['status', 'in', [1,2,3]`
+`in/enum`    | 枚举验证 | `['status', 'in', [1,2,3]`
 `notIn`    | 枚举验证 | `['status', 'notIn', [4,5,6]]`
 `mustBe`   | 必须是等于给定值 | `['status', 'mustBe', 0]`
 `compare/same/equal` | 字段值比较 | `['passwd', 'compare', 'repasswd']`

src/FieldValidation.php

@@ -78,7 +78,6 @@ protected function collectRules()
                     yield $field => $rule;
                 }
             }
-
         }
     }
 
@@ -102,6 +101,7 @@ protected function parseRule($rule, $row)
 
         switch ($name) {
             case 'in':
+            case 'enum':
             case 'ontIn':
                 $row[] = array_map('trim', explode(',', $args));
                 break;

src/Utils/ErrorInformationTrait.php

@@ -42,7 +42,8 @@ trait ErrorMessageTrait
         'size' => [
             '{attr} size validation is not through!',
             '{attr} must be an integer/string/array and minimum value/length is {min}',
-            '{attr} must be an integer/string/array and value/length range {min} ~ {max}',
+            // '{attr} must be an integer/string/array and value/length range {min} ~ {max}',
+            '{attr} must be in the range {min} ~ {max}',
         ],
         'range' => [
             '{attr} range validation is not through!',
@@ -57,6 +58,7 @@ trait ErrorMessageTrait
         'min' => '{attr} minimum boundary is {value0}',
         'max' => '{attr} maximum boundary is {value0}',
         'in' => '{attr} must in ({value0})',
+        'enum' => '{attr} must in ({value0})',
         'notIn' => '{attr} cannot in ({value0})',
         'string' => [
             '{attr} must be a string',
@@ -86,6 +88,158 @@ trait ErrorMessageTrait
      */
     private $_translates = [];
 
+    /**
+     * 保存所有的验证错误信息
+     * @var array[]
+     * [
+     *     [ field => errorMessage1 ],
+     *     [ field => errorMessage2 ],
+     *     [ field2 => errorMessage3 ]
+     * ]
+     */
+    private $_errors = [];
+
+    /**
+     * Whether there is error stop validation 是否出现验证失败就立即停止验证
+     * True  -- 出现一个验证失败即停止验证,并退出
+     * False -- 全部验证并将错误信息保存到 {@see $_errors}
+     * @var boolean
+     */
+    private $_stopOnError = true;
+
+    /*******************************************************************************
+     * Errors Information
+     ******************************************************************************/
+
+    /**
+     * @return $this
+     */
+    public function clearErrors()
+    {
+        $this->_errors = [];
+
+        return $this;
+    }
+
+    /**
+     * 是否有错误
+     * @return boolean
+     */
+    public function hasError(): bool
+    {
+        return $this->isFail();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isFail(): bool
+    {
+        return \count($this->_errors) > 0;
+    }
+
+    /**
+     * @return bool
+     */
+    public function fail(): bool
+    {
+        return $this->isFail();
+    }
+
+    /**
+     * @return bool
+     */
+    public function failed(): bool
+    {
+        return $this->isFail();
+    }
+
+    /**
+     * @return bool
+     */
+    public function passed(): bool
+    {
+        return !$this->isFail();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isPassed(): bool
+    {
+        return !$this->isFail();
+    }
+
+    /**
+     * @param string $attr
+     * @param string $msg
+     */
+    public function addError(string $attr, string $msg)
+    {
+        $this->_errors[] = [$attr => $msg];
+    }
+
+    /**
+     * @return array
+     */
+    public function getErrors(): array
+    {
+        return $this->_errors;
+    }
+
+    /**
+     * 得到第一个错误信息
+     * @author inhere
+     * @param bool $onlyMsg
+     * @return array|string
+     */
+    public function firstError($onlyMsg = true)
+    {
+        $e = $this->_errors;
+        $first = array_shift($e);
+
+        return $onlyMsg ? array_values($first)[0] : $first;
+    }
+
+    /**
+     * 得到最后一个错误信息
+     * @author inhere
+     * @param bool $onlyMsg
+     * @return array|string
+     */
+    public function lastError($onlyMsg = true)
+    {
+        $e = $this->_errors;
+        $last = array_pop($e);
+
+        return $onlyMsg ? array_values($last)[0] : $last;
+    }
+
+    /**
+     * @param bool|null $stopOnError
+     * @return $this
+     */
+    public function setStopOnError($stopOnError = null)
+    {
+        if (null !== $stopOnError) {
+            $this->_stopOnError = (bool)$stopOnError;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isStopOnError(): bool
+    {
+        return $this->_stopOnError;
+    }
+
+    /*******************************************************************************
+     * Error Messages
+     ******************************************************************************/
+
     /**
      * @return array
      */

src/Utils/ErrorMessageTrait.php

@@ -10,7 +10,6 @@
 
 use Inhere\Validate\Utils\Helper;
 use Inhere\Validate\Utils\ErrorMessageTrait;
-use Inhere\Validate\Utils\ErrorInformationTrait;
 use Inhere\Validate\Utils\RequiredValidatorsTrait;
 
 /**
@@ -20,7 +19,7 @@
  */
 trait ValidationTrait
 {
-    use ErrorInformationTrait, ErrorMessageTrait, RequiredValidatorsTrait;
+    use ErrorMessageTrait, RequiredValidatorsTrait;
 
     /**
      * custom add's validator by addValidator()