From a61b0618e05144ca6c22c73c950c3ba49e753498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Mon, 10 Apr 2023 17:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BaseValidator.php |  7 ++-----
 Validator.php     | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/BaseValidator.php b/BaseValidator.php
index b1ade6b..e83015b 100644
--- a/BaseValidator.php
+++ b/BaseValidator.php
@@ -83,14 +83,11 @@ abstract class BaseValidator
 	}
 
 	/**
-	 * @param array|null $data
+	 * @param array $data
 	 * @return $this
 	 */
-	public function setParams(?array $data): static
+	public function setParams(array $data): static
 	{
-		if (is_null($data)) {
-			$data = [];
-		}
 		$this->params = $data;
 		return $this;
 	}
diff --git a/Validator.php b/Validator.php
index 8c7c78d..c3343e1 100644
--- a/Validator.php
+++ b/Validator.php
@@ -6,6 +6,7 @@ namespace validator;
 
 
 use Closure;
+use Database\ModelInterface;
 use Exception;
 use Kiri;
 
@@ -118,6 +119,22 @@ class Validator extends BaseValidator
 		return static::$instance;
 	}
 
+
+	/**
+	 * @param array $params
+	 * @param ModelInterface $model
+	 * @return Validator
+	 */
+	public static function instance(array $params, ModelInterface $model): static
+	{
+		if (static::$instance == null) {
+			static::$instance = new Validator();
+		}
+		static::$instance->setParams($params);
+		static::$instance->setModel($model);
+		return static::$instance;
+	}
+
 	/**
 	 * @param $field
 	 * @param $rules