as2252258/kiri-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert "改名"

Browse Source 
This reverts commit fdf58326
This commit is contained in:
向林
2022-01-04 16:53:31 +08:00
parent 011e0cd9b8
commit 00a53ba0f3
11 changed files with 38 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ArrayValidator.php
+3 -4
View File
@@ -24,14 +24,13 @@ class ArrayValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !is_array($param)) {
if (empty($this->params)) {
return true;
}
if (!isset($param[$this->field])) {
if (!isset($this->params[$this->field])) {
return true;
}
if (!is_array($param[$this->field])) {
if (!is_array($this->params[$this->field])) {
return $this->addError("The param :attribute must a array");
}
return true;
src/DateTimeValidator.php
+9 -16
View File
@@ -25,26 +25,19 @@ class DateTimeValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !is_array($param)) {
if (empty($this->params)) {
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:
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,
};
}
/**
src/EmailValidator.php
+3 -6
View File
@@ -19,17 +19,14 @@ class EmailValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
if (empty($this->params) || !isset($this->params[$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)) {
}
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');
}
}
}
}
src/EmptyValidator.php
+3 -8
View File
@@ -30,26 +30,21 @@ class EmptyValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
if (empty($this->params) || !isset($this->params[$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) {
if (strlen($this->params[$this->field]) < 1) {
return $this->addError('The :attribute can not empty.');
}
break;
case self::CAN_NOT_NULL:
if ($value === null) {
if ($this->params[$this->field] === null) {
return $this->addError('The :attribute can not is null.');
}
break;
}
return true;
}
}
src/EnumValidator.php
+3 -10
View File
@@ -20,22 +20,15 @@ class EnumValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
if (empty($this->params) || !isset($this->params[$this->field])) {
return $this->addError('The param :attribute is null');
}
$value = $param[$this->field];
if (is_null($value)) {
if (is_null($this->params[$this->field])) {
return $this->addError('The param :attribute is null');
}
if (!is_array($this->value)) {
return true;
}
if (!in_array($value, $this->value)) {
if (!in_array($this->params[$this->field], $this->value)) {
return $this->addError($this->i());
}
return true;
}
src/IntegerValidator.php
+3 -10
View File
@@ -24,20 +24,13 @@ class IntegerValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
if (empty($this->params) || !isset($this->params[$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) {
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 && $value > $this->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;
src/LengthValidator.php
+4 -9
View File
@@ -25,22 +25,17 @@ class LengthValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
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;
}
}
$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),
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]),
};
}
src/RequiredValidator.php
+1 -2
View File
@@ -19,8 +19,7 @@ class RequiredValidator extends BaseValidator
*/
public function trigger(): bool
{
$param = $this->getParams();
if (!is_array($param) || !isset($param[$this->field])) {
if (!isset($this->params[$this->field])) {
return $this->addError('The param :attribute not exists');
} else {
return true;
src/TypesOfValidator.php
+3 -11
View File
@@ -46,21 +46,13 @@ class TypesOfValidator extends BaseValidator
if (!in_array($this->method, $this->types)) {
return true;
}
$param = $this->getParams();
if (empty($param) || !isset($param[$this->field])) {
if (empty($this->params) || !isset($this->params[$this->field])) {
return true;
}
$value = $param[$this->field];
$method = $this->method . 'Format';
if ($value === null) {
if ($this->params[$this->field] === null) {
return $this->addError('This ' . $this->field . ' is not an empty data.');
}
return $this->{$method}($value);
return $this->{$this->method . 'Format'}($this->params[$this->field]);
}
/**
src/UniqueValidator.php
+1 -3
View File
@@ -28,12 +28,10 @@ class UniqueValidator extends BaseValidator
if (empty($this->model)) {
return $this->addError('Model error.');
}
$model = $this->model;
if (!$this->model->getIsNowExample()) {
return true;
}
if ($model::query()->where([$this->field => $param[$this->field]])->exists()) {
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;
src/Validator.php
+1 -2
View File
@@ -168,11 +168,10 @@ class Validator extends BaseValidator
if (!isset($this->classMap[$type])) {
continue;
}
$constr = array_merge($this->classMap[$type], $define, [
$this->validators[] = array_merge($this->classMap[$type], $define, [
'params' => $param,
'model' => $model
]);
$this->validators[] = $constr;
}
}