Revert "改名"

This reverts commit fdf58326

.gitignore

@@ -1,34 +1,34 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Yii template
-assets/*
-!assets/.gitignore
-protected/runtime/*
-!protected/runtime/.gitignore
-protected/data/*.db
-themes/classic/views/
-
-### Example user template template
-### Example user template
-
-# IntelliJ project files
-.idea
-*.iml
-out
-gen
-
-composer.lock
-
-*.log
-commands/result
-config/setting.php
-tests/
-vendor/
-runtime/
-
-*.xml
-*.lock
-
-oot
-d
-
-composer.lock
+# Created by .ignore support plugin (hsz.mobi)
+### Yii template
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+
+composer.lock
+
+*.log
+commands/result
+config/setting.php
+tests/
+vendor/
+runtime/
+
+*.xml
+*.lock
+
+oot
+d
+
+composer.lock

ArrayValidator.php

@@ -1,70 +1,69 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/3 0003
- * Time: 15:28
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-/**
- * Class ArrayValidator
- * @package validator
- */
-class ArrayValidator extends BaseValidator
-{
-
-	/**
-	 * @return bool
-	 *
-	 * 检查
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !is_array($param)) {
-			return true;
-		}
-		if (!isset($param[$this->field])) {
-			return true;
-		}
-		if (!is_array($param[$this->field])) {
-			return $this->addError("The param :attribute must a array");
-		}
-		return true;
-	}
-
-	/**
-	 * @param $data
-	 * @return array
-	 *
-	 * 转成数组
-	 */
-	private function toArray($data): array
-	{
-		if (is_numeric($data)) {
-			return [];
-		} else if (is_null(json_decode($data, true))) {
-			return [];
-		} elseif (is_object($data)) {
-			$data = get_object_vars($data);
-		}
-
-		$_tmp = [];
-		foreach ($data as $key => $val) {
-			if (is_object($val)) {
-				$_tmp[$key] = $this->toArray($val);
-			} else if (is_array($val)) {
-				$_tmp[$key] = $this->toArray($val);
-			} else {
-				$_tmp[$key] = $val;
-			}
-		}
-
-		return $_tmp;
-	}
-
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/3 0003
+ * Time: 15:28
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+/**
+ * Class ArrayValidator
+ * @package validator
+ */
+class ArrayValidator extends BaseValidator
+{
+
+	/**
+	 * @return bool
+	 *
+	 * 检查
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params)) {
+			return true;
+		}
+		if (!isset($this->params[$this->field])) {
+			return true;
+		}
+		if (!is_array($this->params[$this->field])) {
+			return $this->addError("The param :attribute must a array");
+		}
+		return true;
+	}
+
+	/**
+	 * @param $data
+	 * @return array
+	 *
+	 * 转成数组
+	 */
+	private function toArray($data): array
+	{
+		if (is_numeric($data)) {
+			return [];
+		} else if (is_null(json_decode($data, true))) {
+			return [];
+		} elseif (is_object($data)) {
+			$data = get_object_vars($data);
+		}
+
+		$_tmp = [];
+		foreach ($data as $key => $val) {
+			if (is_object($val)) {
+				$_tmp[$key] = $this->toArray($val);
+			} else if (is_array($val)) {
+				$_tmp[$key] = $this->toArray($val);
+			} else {
+				$_tmp[$key] = $val;
+			}
+		}
+
+		return $_tmp;
+	}
+
+}

BaseValidator.php

@@ -1,134 +1,137 @@
-<?php
-declare(strict_types=1);
-
-namespace validator;
-
-
-use Database\Model;
-use Exception;
-
-abstract class BaseValidator
-{
-
-	public string $field = '';
-
-	public array $rules = [];
-
-	public string $method;
-
-	protected bool $isFail = TRUE;
-
-	protected string $message = '';
-
-	protected array $params = [];
-
-	protected ?Model $model = null;
-
-
-	/**
-	 * @param $model
-	 */
-	public function setModel($model)
-	{
-		$this->model = $model;
-	}
-
-	/**
-	 * @return Model|null
-	 */
-	public function getModel(): ?Model
-	{
-		return $this->model;
-	}
-
-
-	/**
-	 * BaseValidator constructor.
-	 * @param array $config
-	 */
-	public function __construct(array $config = [])
-	{
-		$this->regConfig($config);
-	}
-
-
-	/**
-	 * @param $config
-	 */
-	private function regConfig($config)
-	{
-		if (empty($config) || !is_array($config)) {
-			return;
-		}
-		foreach ($config as $key => $val) {
-			$this->$key = $val;
-		}
-	}
-
-	/**
-	 * @throws Exception
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-    	throw new Exception('Child Class must define method of trigger');
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function getParams(): array
-	{
-		return $this->params;
-	}
-
-	/**
-	 * @param array $data
-	 * @return $this
-	 */
-	public function setParams(array $data): static
-	{
-		$this->params = $data;
-		return $this;
-	}
-
-	/**
-	 * @param $message
-	 * @return bool
-	 */
-	public function addError($message): bool
-	{
-		$this->isFail = FALSE;
-
-		$message = str_replace(':attribute', $this->field, $message);
-
-		$this->message = $message;
-
-		return $this->isFail;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getError(): string
-	{
-		return $this->message;
-	}
-
-	/**
-	 * @param $name
-	 * @param $value
-	 * @throws Exception
-	 */
-	public function __set($name, $value)
-	{
-		$method = 'set' . ucfirst($name);
-		if (method_exists($this, $method)) {
-			$this->$method($value);
-		} else if (property_exists($this, $name)) {
-			$this->$name = $value;
-		} else {
-			throw new Exception('unknown property ' . $name . ' in class ' . static::class);
-		}
-	}
-}
+<?php
+declare(strict_types=1);
+
+namespace validator;
+
+
+use Database\Model;
+use Exception;
+
+abstract class BaseValidator
+{
+
+	public string $field = '';
+
+	public array $rules = [];
+
+	public string $method;
+
+	protected bool $isFail = TRUE;
+
+	protected string $message = '';
+
+	protected array $params = [];
+
+	protected ?Model $model = null;
+
+
+	/**
+	 * @param $model
+	 */
+	public function setModel($model)
+	{
+		$this->model = $model;
+	}
+
+	/**
+	 * @return Model|null
+	 */
+	public function getModel(): ?Model
+	{
+		return $this->model;
+	}
+
+
+	/**
+	 * BaseValidator constructor.
+	 * @param array $config
+	 */
+	public function __construct(array $config = [])
+	{
+		$this->regConfig($config);
+	}
+
+
+	/**
+	 * @param $config
+	 */
+	private function regConfig($config)
+	{
+		if (empty($config) || !is_array($config)) {
+			return;
+		}
+		foreach ($config as $key => $val) {
+			$this->$key = $val;
+		}
+	}
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function trigger(): bool
+	{
+		throw new Exception('Child Class must define method of trigger');
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getParams(): array
+	{
+		return $this->params;
+	}
+
+	/**
+	 * @param array|null $data
+	 * @return $this
+	 */
+	public function setParams(?array $data): static
+	{
+		if (is_null($data)) {
+			$data = [];
+		}
+		$this->params = $data;
+		return $this;
+	}
+
+	/**
+	 * @param $message
+	 * @return bool
+	 */
+	public function addError($message): bool
+	{
+		$this->isFail = FALSE;
+
+		$message = str_replace(':attribute', $this->field, $message);
+
+		$this->message = $message;
+
+		return $this->isFail;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getError(): string
+	{
+		return $this->message;
+	}
+
+	/**
+	 * @param $name
+	 * @param $value
+	 * @throws Exception
+	 */
+	public function __set($name, $value)
+	{
+		$method = 'set' . ucfirst($name);
+		if (method_exists($this, $method)) {
+			$this->$method($value);
+		} else if (property_exists($this, $name)) {
+			$this->$name = $value;
+		} else {
+			throw new Exception('unknown property ' . $name . ' in class ' . static::class);
+		}
+	}
+}

DateTimeValidator.php

@@ -1,128 +1,121 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/3 0003
- * Time: 15:42
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class DateTimeValidator extends BaseValidator
-{
-	
-	const DATE = 'date';
-	const DATE_TIME = 'datetime';
-	const TIME = 'time';
-	const STR_TO_TIME = 'timestamp';
-
-	public string $method;
-	
-	/**
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !is_array($param)) {
-			return true;
-		}
-		if (!isset($param[$this->field]) || empty($param[$this->field])) {
-			return true;
-		}
-		$value = $param[$this->field];
-		switch (strtolower($this->method)) {
-			case self::DATE:
-				return $this->validatorDate($value);
-			case self::DATE_TIME:
-				return $this->validateDatetime($value);
-			case self::TIME:
-				return $this->validatorTime($value);
-			case self::STR_TO_TIME:
-				return $this->validatorTimestamp($value);
-			default:
-				return true;
-		}
-	}
-	
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验分秒 格式如  01:02 or 01-02
-	 */
-	public function validatorTime($value): bool
-	{
-		if (empty($value) || !is_string($value)) {
-			return $this->addError('The param :attribute not is a date value');
-		}
-		$match = preg_match('/^[0-5]?\d{1}.{1}[0-5]?\d{1}$/', $value, $result);
-		if ($match && $result[0] == $value) {
-			return true;
-		} else {
-			return $this->addError('The param :attribute format error');
-		}
-	}
-	
-	
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验分秒 格式如 2017-12-22 01:02
-	 */
-	public function validateDatetime($value): bool
-	{
-		if (empty($value) || !is_string($value)) {
-			return $this->addError('The param :attribute not is a date value');
-		}
-		$match = '/^\d{4}\-\d{2}\-\d{2}\s+\d{2}:\d{2}:\d{2}$/';
-		$match = preg_match($match, $value, $result);
-		if ($match && $result[0] == $value) {
-			return true;
-		} else {
-			return $this->addError('The param :attribute format error');
-		}
-	}
-	
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验分秒 格式如  2017-12-22
-	 */
-	public function validatorDate($value): bool
-	{
-		if (empty($value) || !is_string($value)) {
-			return $this->addError('The param :attribute not is a date value');
-		}
-		$match = preg_match('/^(\d{4}).*([0-12]).*([0-31]).*$/', $value, $result);
-		if ($match && $result[0] == $value) {
-			return true;
-		} else {
-			return $this->addError('The param :attribute format error');
-		}
-	}
-	
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验时间戳 格式如  1521452254
-	 */
-	public function validatorTimestamp($value): bool
-	{
-		if (empty($value) || !is_numeric($value)) {
-			return $this->addError('The param :attribute not is a timestamp value');
-		}
-		if (strlen((string)$value) != 10) {
-			return $this->addError('The param :attribute not is a timestamp value');
-		}
-		if (!date('YmdHis', $value)) {
-			return $this->addError('The param :attribute format error');
-		}
-		return true;
-	}
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/3 0003
+ * Time: 15:42
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class DateTimeValidator extends BaseValidator
+{
+	
+	const DATE = 'date';
+	const DATE_TIME = 'datetime';
+	const TIME = 'time';
+	const STR_TO_TIME = 'timestamp';
+
+	public string $method;
+	
+	/**
+	 * @return bool
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params)) {
+			return true;
+		}
+		if (!isset($this->params[$this->field]) || empty($this->params[$this->field])) {
+			return true;
+		}
+		return match (strtolower($this->method)) {
+			self::DATE => $this->validatorDate($this->params[$this->field]),
+			self::DATE_TIME => $this->validateDatetime($this->params[$this->field]),
+			self::TIME => $this->validatorTime($this->params[$this->field]),
+			self::STR_TO_TIME => $this->validatorTimestamp($this->params[$this->field]),
+			default => true,
+		};
+	}
+	
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验分秒 格式如  01:02 or 01-02
+	 */
+	public function validatorTime($value): bool
+	{
+		if (empty($value) || !is_string($value)) {
+			return $this->addError('The param :attribute not is a date value');
+		}
+		$match = preg_match('/^[0-5]?\d{1}.{1}[0-5]?\d{1}$/', $value, $result);
+		if ($match && $result[0] == $value) {
+			return true;
+		} else {
+			return $this->addError('The param :attribute format error');
+		}
+	}
+	
+	
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验分秒 格式如 2017-12-22 01:02
+	 */
+	public function validateDatetime($value): bool
+	{
+		if (empty($value) || !is_string($value)) {
+			return $this->addError('The param :attribute not is a date value');
+		}
+		$match = '/^\d{4}\-\d{2}\-\d{2}\s+\d{2}:\d{2}:\d{2}$/';
+		$match = preg_match($match, $value, $result);
+		if ($match && $result[0] == $value) {
+			return true;
+		} else {
+			return $this->addError('The param :attribute format error');
+		}
+	}
+	
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验分秒 格式如  2017-12-22
+	 */
+	public function validatorDate($value): bool
+	{
+		if (empty($value) || !is_string($value)) {
+			return $this->addError('The param :attribute not is a date value');
+		}
+		$match = preg_match('/^(\d{4}).*([0-12]).*([0-31]).*$/', $value, $result);
+		if ($match && $result[0] == $value) {
+			return true;
+		} else {
+			return $this->addError('The param :attribute format error');
+		}
+	}
+	
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验时间戳 格式如  1521452254
+	 */
+	public function validatorTimestamp($value): bool
+	{
+		if (empty($value) || !is_numeric($value)) {
+			return $this->addError('The param :attribute not is a timestamp value');
+		}
+		if (strlen((string)$value) != 10) {
+			return $this->addError('The param :attribute not is a timestamp value');
+		}
+		if (!date('YmdHis', $value)) {
+			return $this->addError('The param :attribute format error');
+		}
+		return true;
+	}
+}

EmailValidator.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/20 0020
+ * Time: 17:32
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class EmailValidator extends BaseValidator
+{
+
+	/**
+	 * @return bool
+	 * 检查是否存在
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			return true;
+		}
+		if (preg_match('/^[a-zA-Z0-9]+([\.\_]{1,})[a-zA-Z0-9]+@[a-zA-Z]+(\.\w+)+/', $this->params[$this->field])) {
+			return true;
+		} else {
+			return $this->addError('The param :attribute format error');
+		}
+	}
+
+}

EmptyValidator.php

@@ -1,55 +1,50 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/3 0003
- * Time: 15:46
- */
-
-declare(strict_types=1);
-
-
-namespace validator;
-
-
-class EmptyValidator extends BaseValidator
-{
-	
-	/** @var string [不能为空] */
-	const CAN_NOT_EMPTY = 'not empty';
-	
-	/** @var string [可为空, 不能为null] */
-	const CAN_NOT_NULL = 'not null';
-
-	public string $method;
-	
-	/**
-	 * @return bool
-	 *
-	 * 检查参数是否为NULL
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return $this->addError(':attribute not exists');
-		}
-		
-		$value = $param[$this->field];
-		
-		switch (strtolower($this->method)) {
-			case self::CAN_NOT_EMPTY:
-				if (strlen($value) < 1) {
-					return $this->addError('The :attribute can not empty.');
-				}
-				break;
-			case self::CAN_NOT_NULL:
-				if ($value === null) {
-					return $this->addError('The :attribute can not is null.');
-				}
-				break;
-		}
-		
-		return true;
-	}
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/3 0003
+ * Time: 15:46
+ */
+
+declare(strict_types=1);
+
+
+namespace validator;
+
+
+class EmptyValidator extends BaseValidator
+{
+	
+	/** @var string [不能为空] */
+	const CAN_NOT_EMPTY = 'not empty';
+	
+	/** @var string [可为空, 不能为null] */
+	const CAN_NOT_NULL = 'not null';
+
+	public string $method;
+	
+	/**
+	 * @return bool
+	 *
+	 * 检查参数是否为NULL
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			return $this->addError(':attribute not exists');
+		}
+		switch (strtolower($this->method)) {
+			case self::CAN_NOT_EMPTY:
+				if (strlen($this->params[$this->field]) < 1) {
+					return $this->addError('The :attribute can not empty.');
+				}
+				break;
+			case self::CAN_NOT_NULL:
+				if ($this->params[$this->field] === null) {
+					return $this->addError('The :attribute can not is null.');
+				}
+				break;
+		}
+		return true;
+	}
+}

EnumValidator.php

@@ -1,50 +1,43 @@
-<?php
-
-declare(strict_types=1);
-
-namespace validator;
-
-
-
-/**
- * Class EnumValidator
- * @package validator
- */
-class EnumValidator extends BaseValidator
-{
-
-	public array $value = [];
-
-	/**
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return $this->addError('The param :attribute is null');
-		}
-		$value = $param[$this->field];
-		if (is_null($value)) {
-			return $this->addError('The param :attribute is null');
-		}
-
-		if (!is_array($this->value)) {
-			return true;
-		}
-		if (!in_array($value, $this->value)) {
-			return $this->addError($this->i());
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return string
-	 */
-	private function i(): string
-	{
-		return 'The param :attribute value only in ' . implode(',', $this->value);
-	}
-
-}
+<?php
+
+declare(strict_types=1);
+
+namespace validator;
+
+
+
+/**
+ * Class EnumValidator
+ * @package validator
+ */
+class EnumValidator extends BaseValidator
+{
+
+	public array $value = [];
+
+	/**
+	 * @return bool
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			return $this->addError('The param :attribute is null');
+		}
+		if (is_null($this->params[$this->field])) {
+			return $this->addError('The param :attribute is null');
+		}
+		if (!in_array($this->params[$this->field], $this->value)) {
+			return $this->addError($this->i());
+		}
+		return true;
+	}
+
+	/**
+	 * @return string
+	 */
+	private function i(): string
+	{
+		return 'The param :attribute value only in ' . implode(',', $this->value);
+	}
+
+}

IntegerValidator.php

@@ -1,45 +1,38 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/4 0004
- * Time: 18:44
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class IntegerValidator extends BaseValidator
-{
-
-	const MIN = 'min';
-	const MAX = 'max';
-
-	public ?int $value = null;
-	private string $type = '';
-
-	/**
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return true;
-		}
-
-		$value = $param[$this->field] ?? null;
-		if ($value === null) {
-			return $this->addError('The :attribute can not is null.');
-		}
-		if ($this->type !== self::MIN && $value < $this->value) {
-			return $this->addError('The ' . $this->field . ' cannot be less than the default value.');
-		}
-
-		if ($this->type !== self::MAX && $value > $this->value) {
-			return $this->addError('The ' . $this->field . ' cannot be greater than the default value.');
-		}
-		return true;
-	}
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/4 0004
+ * Time: 18:44
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class IntegerValidator extends BaseValidator
+{
+
+	const MIN = 'min';
+	const MAX = 'max';
+
+	public ?int $value = null;
+	private string $type = '';
+
+	/**
+	 * @return bool
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			return true;
+		}
+		if ($this->type !== self::MIN && $this->params[$this->field] < $this->value) {
+			return $this->addError('The ' . $this->field . ' cannot be less than the default value.');
+		}
+		if ($this->type !== self::MAX && $this->params[$this->field] > $this->value) {
+			return $this->addError('The ' . $this->field . ' cannot be greater than the default value.');
+		}
+		return true;
+	}
+}

LengthValidator.php

@@ -1,115 +1,110 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/3 0003
- * Time: 17:04
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class LengthValidator extends BaseValidator
-{
-
-	const MAX_LENGTH = 'max';
-	const MIN_LENGTH = 'min';
-
-	public string $method;
-
-	public int $value;
-
-	/**
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			if ($this->method != self::MAX_LENGTH) {
-				return $this->addError('The param :attribute not exists');
-			} else {
-				return TRUE;
-			}
-		}
-		$value = $param[$this->field];
-		if (is_null($value)) {
-			return $this->addError('The param :attribute is null');
-		}
-		return match (strtolower($this->method)) {
-			self::MAX_LENGTH => $this->maxLength($value),
-			self::MIN_LENGTH => $this->minLength($value),
-			default => $this->defaultLength($value),
-		};
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验长度是否大于最大长度
-	 */
-	private function maxLength($value): bool
-	{
-		if (is_array($value)) {
-			if (count($value) > $value) {
-				return $this->addError('The param :attribute length overflow');
-			}
-		} else {
-			if (is_numeric($value) && strlen((string)$value) > $this->value) {
-				return $this->addError('The param :attribute length overflow');
-			}
-			if (strlen($value) > $this->value) {
-				return $this->addError('The param :attribute length overflow');
-			}
-		}
-		return TRUE;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验长度是否小于最小长度
-	 */
-	private function minLength($value): bool
-	{
-		if (is_array($value)) {
-			if (count($value) < $value) {
-				return $this->addError('The param :attribute length error');
-			}
-		} else {
-			if (is_numeric($value) && strlen((string)$value) < $this->value) {
-				return $this->addError('The param :attribute length overflow');
-			}
-			if (strlen($value) < $this->value) {
-				return $this->addError('The param :attribute length error');
-			}
-		}
-		return TRUE;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 *
-	 * 效验长度是否小于最小长度
-	 */
-	private function defaultLength($value): bool
-	{
-		if (is_array($value)) {
-			if (count($value) !== $value) {
-				return $this->addError('The param :attribute length error');
-			}
-		} else {
-			if (is_numeric($value) && strlen((string)$value) !== $this->value) {
-				return $this->addError('The param :attribute length overflow');
-			}
-			if (mb_strlen($value) !== $this->value) {
-				return $this->addError('The param :attribute length error; ' . mb_strlen($value) . ':' . $this->value);
-			}
-		}
-		return TRUE;
-	}
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/3 0003
+ * Time: 17:04
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class LengthValidator extends BaseValidator
+{
+
+	const MAX_LENGTH = 'max';
+	const MIN_LENGTH = 'min';
+
+	public string $method;
+
+	public int $value;
+
+	/**
+	 * @return bool
+	 */
+	public function trigger(): bool
+	{
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			if ($this->method != self::MAX_LENGTH) {
+				return $this->addError('The param :attribute not exists');
+			} else {
+				return TRUE;
+			}
+		}
+		return match (strtolower($this->method)) {
+			self::MAX_LENGTH => $this->maxLength($this->params[$this->field]),
+			self::MIN_LENGTH => $this->minLength($this->params[$this->field]),
+			default => $this->defaultLength($this->params[$this->field]),
+		};
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验长度是否大于最大长度
+	 */
+	private function maxLength($value): bool
+	{
+		if (is_array($value)) {
+			if (count($value) > $value) {
+				return $this->addError('The param :attribute length overflow');
+			}
+		} else {
+			if (is_numeric($value) && strlen((string)$value) > $this->value) {
+				return $this->addError('The param :attribute length overflow');
+			}
+			if (strlen($value) > $this->value) {
+				return $this->addError('The param :attribute length overflow');
+			}
+		}
+		return TRUE;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验长度是否小于最小长度
+	 */
+	private function minLength($value): bool
+	{
+		if (is_array($value)) {
+			if (count($value) < $value) {
+				return $this->addError('The param :attribute length error');
+			}
+		} else {
+			if (is_numeric($value) && strlen((string)$value) < $this->value) {
+				return $this->addError('The param :attribute length overflow');
+			}
+			if (strlen($value) < $this->value) {
+				return $this->addError('The param :attribute length error');
+			}
+		}
+		return TRUE;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 *
+	 * 效验长度是否小于最小长度
+	 */
+	private function defaultLength($value): bool
+	{
+		if (is_array($value)) {
+			if (count($value) !== $value) {
+				return $this->addError('The param :attribute length error');
+			}
+		} else {
+			if (is_numeric($value) && strlen((string)$value) !== $this->value) {
+				return $this->addError('The param :attribute length overflow');
+			}
+			if (mb_strlen($value) !== $this->value) {
+				return $this->addError('The param :attribute length error; ' . mb_strlen($value) . ':' . $this->value);
+			}
+		}
+		return TRUE;
+	}
+}

RequiredValidator.php

@@ -1,33 +1,29 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/3 0003
- * Time: 15:47
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class RequiredValidator extends BaseValidator
-{
-
-	/**
-	 * @return bool
-	 * 检查是否存在
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (is_numeric($param)) {
-			return true;
-		}
-		if (empty($param) || !isset($param[$this->field])) {
-			return $this->addError('The param :attribute not exists');
-		} else {
-			return true;
-		}
-	}
-
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/3 0003
+ * Time: 15:47
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class RequiredValidator extends BaseValidator
+{
+
+	/**
+	 * @return bool
+	 * 检查是否存在
+	 */
+	public function trigger(): bool
+	{
+		if (!isset($this->params[$this->field])) {
+			return $this->addError('The param :attribute not exists');
+		} else {
+			return true;
+		}
+	}
+
+}

RoundValidator.php

@@ -1,34 +1,34 @@
-<?php
-
-
-namespace validator;
-
-
-use Exception;
-
-/**
- * Class RoundValidator
- * @package validator
- */
-class RoundValidator extends BaseValidator
-{
-
-
-	public ?int $value = null;
-
-
-	/**
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function trigger(): bool
-	{
-		$value = $this->model->getAttribute($this->field);
-		if ($value == null || round($value, $this->value) != $value) {
-			return $this->addError('The param :attribute length error');
-		}
-		return true;
-	}
-
-
-}
+<?php
+
+
+namespace validator;
+
+
+use Exception;
+
+/**
+ * Class RoundValidator
+ * @package validator
+ */
+class RoundValidator extends BaseValidator
+{
+
+
+	public ?int $value = null;
+
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function trigger(): bool
+	{
+		$value = $this->model->getAttribute($this->field);
+		if ($value == null || round($value, $this->value) != $value) {
+			return $this->addError('The param :attribute length error');
+		}
+		return true;
+	}
+
+
+}

TypesOfValidator.php

@@ -1,149 +1,141 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/4 0004
- * Time: 18:44
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class TypesOfValidator extends BaseValidator
-{
-
-
-	const JSON = 'json';
-	const FLOAT = 'float';
-	const ARRAY = 'array';
-	const STRING = 'string';
-	const INTEGER = 'integer';
-	const SERIALIZE = 'serialize';
-
-	private ?int $min = null;
-	private ?int $max = null;
-
-	/** @var array */
-	public array $types = [
-		self::JSON      => 'json',
-		self::FLOAT     => 'float',
-		self::ARRAY     => 'array',
-		self::STRING    => 'string',
-		self::INTEGER   => 'integer',
-		self::SERIALIZE => 'serialize',
-	];
-
-	/** @var string */
-	public string $method;
-
-
-	/**
-	 * @return bool
-	 */
-	public function trigger(): bool
-	{
-		if (!in_array($this->method, $this->types)) {
-			return true;
-		}
-
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return true;
-		}
-
-		$value = $param[$this->field];
-
-		$method = $this->method . 'Format';
-
-		if ($value === null) {
-			return $this->addError('This ' . $this->field . ' is not an empty data.');
-		}
-
-		return $this->{$method}($value);
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function jsonFormat($value): bool
-	{
-		if (!is_string($value) || is_numeric($value)) {
-			return $this->addError('The ' . $this->field . ' not is JSON data.');
-		}
-		if (is_null(json_decode($value))) {
-			return $this->addError('The ' . $this->field . ' not is JSON data.');
-		}
-		return true;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function serializeFormat($value): bool
-	{
-		if (!is_string($value) || is_numeric($value)) {
-			return $this->addError('The ' . $this->field . ' not is serialize data.');
-		}
-		if (false === swoole_unserialize($value)) {
-			return $this->addError('The ' . $this->field . ' not is serialize data.');
-		}
-		return true;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function arrayFormat($value): bool
-	{
-		if (!is_array($value)) {
-			return $this->addError('The ' . $this->field . ' not is array data.');
-		}
-		return true;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function stringFormat($value): bool
-	{
-		if (is_array($value) || is_object($value) || is_bool($value)) {
-			return $this->addError('The ' . $this->field . ' not is string data.');
-		}
-		return true;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function integerFormat($value): bool
-	{
-		if (!is_numeric($value)) {
-			return $this->addError('The ' . $this->field . ' not is number data.');
-		}
-		if ((int)$value != $value) {
-			return $this->addError('The ' . $this->field . ' not is number data.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	public function floatFormat($value): bool
-	{
-		$trim = (float)$value;
-		if ($trim != $value || !is_float($trim)) {
-			return $this->addError('The ' . $this->field . ' not is float data.');
-		}
-		return true;
-	}
-
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/4/4 0004
+ * Time: 18:44
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class TypesOfValidator extends BaseValidator
+{
+
+
+	const JSON = 'json';
+	const FLOAT = 'float';
+	const ARRAY = 'array';
+	const STRING = 'string';
+	const INTEGER = 'integer';
+	const SERIALIZE = 'serialize';
+
+	private ?int $min = null;
+	private ?int $max = null;
+
+	/** @var array */
+	public array $types = [
+		self::JSON      => 'json',
+		self::FLOAT     => 'float',
+		self::ARRAY     => 'array',
+		self::STRING    => 'string',
+		self::INTEGER   => 'integer',
+		self::SERIALIZE => 'serialize',
+	];
+
+	/** @var string */
+	public string $method;
+
+
+	/**
+	 * @return bool
+	 */
+	public function trigger(): bool
+	{
+		if (!in_array($this->method, $this->types)) {
+			return true;
+		}
+		if (empty($this->params) || !isset($this->params[$this->field])) {
+			return true;
+		}
+		if ($this->params[$this->field] === null) {
+			return $this->addError('This ' . $this->field . ' is not an empty data.');
+		}
+		return $this->{$this->method . 'Format'}($this->params[$this->field]);
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function jsonFormat($value): bool
+	{
+		if (!is_string($value) || is_numeric($value)) {
+			return $this->addError('The ' . $this->field . ' not is JSON data.');
+		}
+		if (is_null(json_decode($value))) {
+			return $this->addError('The ' . $this->field . ' not is JSON data.');
+		}
+		return true;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function serializeFormat($value): bool
+	{
+		if (!is_string($value) || is_numeric($value)) {
+			return $this->addError('The ' . $this->field . ' not is serialize data.');
+		}
+		if (false === swoole_unserialize($value)) {
+			return $this->addError('The ' . $this->field . ' not is serialize data.');
+		}
+		return true;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function arrayFormat($value): bool
+	{
+		if (!is_array($value)) {
+			return $this->addError('The ' . $this->field . ' not is array data.');
+		}
+		return true;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function stringFormat($value): bool
+	{
+		if (is_array($value) || is_object($value) || is_bool($value)) {
+			return $this->addError('The ' . $this->field . ' not is string data.');
+		}
+		return true;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function integerFormat($value): bool
+	{
+		if (!is_numeric($value)) {
+			return $this->addError('The ' . $this->field . ' not is number data.');
+		}
+		if ((int)$value != $value) {
+			return $this->addError('The ' . $this->field . ' not is number data.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $value
+	 * @return bool
+	 */
+	public function floatFormat($value): bool
+	{
+		$trim = (float)$value;
+		if ($trim != $value || !is_float($trim)) {
+			return $this->addError('The ' . $this->field . ' not is float data.');
+		}
+		return true;
+	}
+
+}

UniqueValidator.php

@@ -1,43 +1,41 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: qv
- * Date: 2018/10/16 0016
- * Time: 10:24
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class UniqueValidator extends BaseValidator
-{
-
-	/**
-	 * @return bool
-	 * @throws
-	 * 检查是否存在
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return TRUE;
-		}
-
-		if (empty($this->model)) {
-			return $this->addError('Model error.');
-		}
-
-		$model = $this->model;
-		if (!$this->model->getIsCreate()) {
-			return true;
-		}
-		if ($model::query()->where([$this->field => $param[$this->field]])->exists()) {
-			return $this->addError('The :attribute \'' . $param[$this->field] . '\' is exists!');
-		}
-		return $this->isFail = TRUE;
-	}
-
-
-}
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qv
+ * Date: 2018/10/16 0016
+ * Time: 10:24
+ */
+declare(strict_types=1);
+
+namespace validator;
+
+
+class UniqueValidator extends BaseValidator
+{
+
+	/**
+	 * @return bool
+	 * @throws
+	 * 检查是否存在
+	 */
+	public function trigger(): bool
+	{
+		$param = $this->getParams();
+		if (empty($param) || !isset($param[$this->field])) {
+			return TRUE;
+		}
+
+		if (empty($this->model)) {
+			return $this->addError('Model error.');
+		}
+		if (!$this->model->getIsNowExample()) {
+			return true;
+		}
+		if ($this->model::query()->where([$this->field => $param[$this->field]])->exists()) {
+			return $this->addError('The :attribute \'' . $param[$this->field] . '\' is exists!');
+		}
+		return $this->isFail = TRUE;
+	}
+
+
+}

Validator.php

@@ -1,222 +1,221 @@
-<?php
-declare(strict_types=1);
-
-
-namespace validator;
-
-
-use Closure;
-use Exception;
-use Kiri\Kiri;
-
-/**
- * Class Validator
- * @package validator
- */
-class Validator extends BaseValidator
-{
-
-	/** @var BaseValidator[] */
-	private ?array $validators = [];
-
-	/** @var ?Validator */
-	private static ?Validator $instance = null;
-
-	protected array $classMap = [
-		'not empty' => [
-			'class'  => 'validator\EmptyValidator',
-			'method' => EmptyValidator::CAN_NOT_EMPTY,
-		],
-		'not null'  => [
-			'class'  => 'validator\EmptyValidator',
-			'method' => EmptyValidator::CAN_NOT_NULL,
-		],
-		'required'  => [
-			'class' => 'validator\RequiredValidator',
-		],
-		'enum'      => [
-			'class' => 'validator\EnumValidator',
-		],
-		'unique'    => [
-			'class' => 'validator\UniqueValidator',
-		],
-		'datetime'  => [
-			'class'  => 'validator\DatetimeValidator',
-			'method' => DateTimeValidator::DATE_TIME,
-		],
-		'date'      => [
-			'class'  => 'validator\DatetimeValidator',
-			'method' => DateTimeValidator::DATE,
-		],
-		'time'      => [
-			'class'  => 'validator\DatetimeValidator',
-			'method' => DateTimeValidator::TIME,
-		],
-		'timestamp' => [
-			'class'  => 'validator\DatetimeValidator',
-			'method' => DateTimeValidator::STR_TO_TIME,
-		],
-		'string'    => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::STRING,
-		],
-		'int'       => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::INTEGER,
-		],
-		'min'       => [
-			'class' => IntegerValidator::class
-		],
-		'max'       => [
-			'class' => IntegerValidator::class
-		],
-		'json'      => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::JSON,
-		],
-		'float'     => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::FLOAT,
-		],
-		'array'     => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::ARRAY,
-		],
-		'serialize' => [
-			'class'  => 'validator\TypesOfValidator',
-			'method' => TypesOfValidator::SERIALIZE,
-		],
-		'maxLength' => [
-			'class'  => 'validator\LengthValidator',
-			'method' => 'max',
-		],
-		'minLength' => [
-			'class'  => 'validator\LengthValidator',
-			'method' => 'min',
-		],
-		'email'     => [
-			'class'  => 'validator\EmailValidator',
-			'method' => 'email',
-		],
-		'length'    => [
-			'class'  => 'validator\LengthValidator',
-			'method' => 'default',
-		],
-		'round'     => [
-			'class' => 'validator\RoundValidator',
-		],
-	];
-
-	/**
-	 * @return Validator|null
-	 */
-	public static function getInstance(): ?Validator
-	{
-		if (static::$instance == null) {
-			static::$instance = new Validator();
-		}
-		return static::$instance;
-	}
-
-	/**
-	 * @param $field
-	 * @param $rules
-	 * @return $this
-	 * @throws Exception
-	 */
-	public function make($field, $rules): static
-	{
-		if (!is_array($field)) {
-			$field = [$field];
-		}
-
-		$param = $this->getParams();
-		$model = $this->getModel();
-		foreach ($field as $val) {
-			$this->createRule($val, $rules, $model, $param);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param $field
-	 * @param $rule
-	 * @param $model
-	 * @param $param
-	 * @throws Exception
-	 * ['maxLength'=>150, 'required', 'minLength' => 100]
-	 */
-	public function createRule($field, $rule, $model, $param)
-	{
-		$define = ['field' => $field];
-
-		$is_model = is_null($model);
-		foreach ($rule as $key => $val) {
-			if (!$is_model) {
-				if (is_string($val) && method_exists($model, $val)) {
-					$this->validators[] = [$model, $val];
-					continue;
-				}
-			}
-			if (is_string($key)) {
-				$type = strtolower($key);
-				$define['value'] = $val;
-			} else {
-				$type = strtolower($val);
-			}
-			if (!isset($this->classMap[$type])) {
-				continue;
-			}
-			$constr = array_merge($this->classMap[$type], $define, [
-				'params' => $param,
-				'model'  => $model
-			]);
-			$this->validators[] = $constr;
-		}
-	}
-
-	/**
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function validation(): bool
-	{
-		if (count($this->validators) < 1) {
-			return true;
-		}
-		foreach ($this->validators as $val) {
-			if ($this->check($val)) {
-				continue;
-			}
-			$isTrue = false;
-			if ($val instanceof BaseValidator) {
-				$this->addError($val->getError());
-			}
-			break;
-		}
-		$this->validators = null;
-		$this->validators = [];
-		return !isset($isTrue);
-	}
-
-	/**
-	 * @param BaseValidator|array|Closure $val
-	 * @return mixed
-	 * @throws Exception
-	 */
-	private function check(BaseValidator|array|Closure $val): mixed
-	{
-		if (is_callable($val, true)) {
-			return call_user_func($val, $this);
-		}
-
-		$class = Kiri::getDi()->get($val['class']);
-		unset($val['class']);
-
-		Kiri::configure($class, $val);
-
-		return $class->trigger();
-	}
-
-}
+<?php
+declare(strict_types=1);
+
+
+namespace validator;
+
+
+use Closure;
+use Exception;
+use Kiri;
+
+/**
+ * Class Validator
+ * @package validator
+ */
+class Validator extends BaseValidator
+{
+
+	/** @var BaseValidator[] */
+	private ?array $validators = [];
+
+	/** @var ?Validator */
+	private static ?Validator $instance = null;
+
+	protected array $classMap = [
+		'not empty' => [
+			'class'  => 'validator\EmptyValidator',
+			'method' => EmptyValidator::CAN_NOT_EMPTY,
+		],
+		'not null'  => [
+			'class'  => 'validator\EmptyValidator',
+			'method' => EmptyValidator::CAN_NOT_NULL,
+		],
+		'required'  => [
+			'class' => 'validator\RequiredValidator',
+		],
+		'enum'      => [
+			'class' => 'validator\EnumValidator',
+		],
+		'unique'    => [
+			'class' => 'validator\UniqueValidator',
+		],
+		'datetime'  => [
+			'class'  => 'validator\DatetimeValidator',
+			'method' => DateTimeValidator::DATE_TIME,
+		],
+		'date'      => [
+			'class'  => 'validator\DatetimeValidator',
+			'method' => DateTimeValidator::DATE,
+		],
+		'time'      => [
+			'class'  => 'validator\DatetimeValidator',
+			'method' => DateTimeValidator::TIME,
+		],
+		'timestamp' => [
+			'class'  => 'validator\DatetimeValidator',
+			'method' => DateTimeValidator::STR_TO_TIME,
+		],
+		'string'    => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::STRING,
+		],
+		'int'       => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::INTEGER,
+		],
+		'min'       => [
+			'class' => IntegerValidator::class
+		],
+		'max'       => [
+			'class' => IntegerValidator::class
+		],
+		'json'      => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::JSON,
+		],
+		'float'     => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::FLOAT,
+		],
+		'array'     => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::ARRAY,
+		],
+		'serialize' => [
+			'class'  => 'validator\TypesOfValidator',
+			'method' => TypesOfValidator::SERIALIZE,
+		],
+		'maxLength' => [
+			'class'  => 'validator\LengthValidator',
+			'method' => 'max',
+		],
+		'minLength' => [
+			'class'  => 'validator\LengthValidator',
+			'method' => 'min',
+		],
+		'email'     => [
+			'class'  => 'validator\EmailValidator',
+			'method' => 'email',
+		],
+		'length'    => [
+			'class'  => 'validator\LengthValidator',
+			'method' => 'default',
+		],
+		'round'     => [
+			'class' => 'validator\RoundValidator',
+		],
+	];
+
+	/**
+	 * @return Validator|null
+	 */
+	public static function getInstance(): ?Validator
+	{
+		if (static::$instance == null) {
+			static::$instance = new Validator();
+		}
+		return static::$instance;
+	}
+
+	/**
+	 * @param $field
+	 * @param $rules
+	 * @return $this
+	 * @throws Exception
+	 */
+	public function make($field, $rules): static
+	{
+		if (!is_array($field)) {
+			$field = [$field];
+		}
+
+		$param = $this->getParams();
+		$model = $this->getModel();
+		foreach ($field as $val) {
+			$this->createRule($val, $rules, $model, $param);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param $field
+	 * @param $rule
+	 * @param $model
+	 * @param $param
+	 * @throws Exception
+	 * ['maxLength'=>150, 'required', 'minLength' => 100]
+	 */
+	public function createRule($field, $rule, $model, $param)
+	{
+		$define = ['field' => $field];
+
+		$is_model = is_null($model);
+		foreach ($rule as $key => $val) {
+			if (!$is_model) {
+				if (is_string($val) && method_exists($model, $val)) {
+					$this->validators[] = [$model, $val];
+					continue;
+				}
+			}
+			if (is_string($key)) {
+				$type = strtolower($key);
+				$define['value'] = $val;
+			} else {
+				$type = strtolower($val);
+			}
+			if (!isset($this->classMap[$type])) {
+				continue;
+			}
+			$this->validators[] = array_merge($this->classMap[$type], $define, [
+				'params' => $param,
+				'model'  => $model
+			]);
+		}
+	}
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function validation(): bool
+	{
+		if (count($this->validators) < 1) {
+			return true;
+		}
+		foreach ($this->validators as $val) {
+			[$result, $validator] = $this->check($val);
+			if ($result === true) {
+				continue;
+			}
+			$isTrue = false;
+			if ($validator instanceof BaseValidator) {
+				$this->addError($validator->getError());
+			}
+			break;
+		}
+		$this->validators = [];
+		return !isset($isTrue);
+	}
+
+	/**
+	 * @param BaseValidator|array|Closure $val
+	 * @return mixed
+	 * @throws Exception
+	 */
+	private function check(BaseValidator|array|Closure $val): mixed
+	{
+		if (is_callable($val, true)) {
+			return [call_user_func($val, $this), $val];
+		}
+
+		$class = Kiri::getDi()->get($val['class']);
+		unset($val['class']);
+
+		Kiri::configure($class, $val);
+
+		return [$class->trigger(), $class];
+	}
+
+}

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "game-worker/validator",
+  "name": "game-worker/kiri-validator",
   "description": "db",
   "authors": [
     {
@@ -15,7 +15,7 @@
   },
   "autoload": {
     "psr-4": {
-      "validator\\": "src/"
+      "validator\\": "./"
      }
   },
   "require-dev": {

src/EmailValidator.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/20 0020
- * Time: 17:32
- */
-declare(strict_types=1);
-
-namespace validator;
-
-
-class EmailValidator extends BaseValidator
-{
-	
-	/**
-	 * @return bool
-	 * 检查是否存在
-	 */
-	public function trigger(): bool
-	{
-		$param = $this->getParams();
-		if (empty($param) || !isset($param[$this->field])) {
-			return true;
-		} else {
-			$value = $param[$this->field];
-			if (preg_match('/^[a-zA-Z0-9]+([\.\_]{1,})[a-zA-Z0-9]+@[a-zA-Z]+(\.\w+)+/', $value)) {
-				return true;
-			} else {
-				return $this->addError('The param :attribute format error');
-			}
-		}
-	}
-	
-}