改名

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "game-worker/validator",
+  "name": "game-worker/kiri-validator",
   "description": "db",
   "authors": [
     {
@@ -11,8 +11,7 @@
   "require": {
     "php": ">=8.0",
     "ext-json": "*",
-    "ext-pdo": "*",
+    "ext-pdo": "*"
-    "game-worker/snowflake": "dev-master"
   },
   "autoload": {
     "psr-4": {
@@ -20,6 +19,5 @@
      }
   },
   "require-dev": {
-    "kwn/php-rdkafka-stubs": "^2.0"
   }
 }

src/BaseValidator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace validator;
 
 
-use Database\ActiveRecord;
+use Database\Model;
 use Exception;
 
 abstract class BaseValidator
@@ -22,7 +22,7 @@ abstract class BaseValidator
 
 	protected array $params = [];
 
-	protected ?ActiveRecord $model = null;
+	protected ?Model $model = null;
 
 
 	/**
@@ -34,9 +34,9 @@ abstract class BaseValidator
 	}
 
 	/**
-	 * @return ActiveRecord|null
+	 * @return Model|null
 	 */
-	public function getModel(): ?ActiveRecord
+	public function getModel(): ?Model
 	{
 		return $this->model;
 	}

src/UniqueValidator.php

@@ -33,7 +33,7 @@ class UniqueValidator extends BaseValidator
 		if (!$this->model->getIsCreate()) {
 			return true;
 		}
-		if ($model::find()->where([$this->field => $param[$this->field]])->exists()) {
+		if ($model::query()->where([$this->field => $param[$this->field]])->exists()) {
 			return $this->addError('The :attribute \'' . $param[$this->field] . '\' is exists!');
 		}
 		return $this->isFail = TRUE;

src/Validator.php

@@ -34,7 +34,7 @@ class Validator extends BaseValidator
 		'required'  => [
 			'class' => 'validator\RequiredValidator',
 		],
-		'enums'     => [
+		'enum'      => [
 			'class' => 'validator\EnumValidator',
 		],
 		'unique'    => [
@@ -102,8 +102,8 @@ class Validator extends BaseValidator
 			'class'  => 'validator\LengthValidator',
 			'method' => 'default',
 		],
-		'round'    => [
+		'round'     => [
-			'class'  => 'validator\RoundValidator',
+			'class' => 'validator\RoundValidator',
 		],
 	];
 
@@ -150,33 +150,29 @@ class Validator extends BaseValidator
 	public function createRule($field, $rule, $model, $param)
 	{
 		$define = ['field' => $field];
-		foreach ($rule as $key => $val) {
 
-			if (!is_null($model)) {
+		$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);
+			$constr = array_merge($this->classMap[$type], $define, [
-
+				'params' => $param,
-			/** @var BaseValidator $class */
+				'model'  => $model
-			$class = Kiri::createObject($constr);
+			]);
-			$class->setParams($param);
+			$this->validators[] = $constr;
-			$class->setModel($model);
-
-			$this->validators[] = $class;
 		}
 	}
 
@@ -189,7 +185,6 @@ class Validator extends BaseValidator
 		if (count($this->validators) < 1) {
 			return true;
 		}
-
 		foreach ($this->validators as $val) {
 			if ($this->check($val)) {
 				continue;
@@ -215,7 +210,13 @@ class Validator extends BaseValidator
 		if (is_callable($val, true)) {
 			return call_user_func($val, $this);
 		}
-		return $val->trigger();
+
+		$class = Kiri::getDi()->get($val['class']);
+		unset($val['class']);
+
+		Kiri::configure($class, $val);
+
+		return $class->trigger();
 	}
 
 }