modify plugin name

2022-02-18 17:16:45 +08:00
parent 1acf3fb48b
commit ba410c90da
13 changed files with 182 additions and 178 deletions
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace validator;


-
 /**
 * Class EnumValidator
 * @package validator
@@ -20,24 +19,16 @@ class EnumValidator extends BaseValidator
 	 */
 	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);
+		return $this->_validator($this->field, function ($field, $params, $values) {
+			$value = $params[$field] ?? null;
+			if (empty($value)) {
+				return $this->addError('The param :attribute is null');
+			}
+			if (!in_array($value, $values)) {
+				return $this->addError('The param :attribute value only in ' . implode(',', $values));
+			}
+			return true;
+		}, $this->params, $this->value);
 	}

 }