modify plugin name
This commit is contained in:
+17
-17
@@ -31,10 +31,10 @@ class DateTimeValidator extends BaseValidator
|
||||
return true;
|
||||
}
|
||||
return match ($method) {
|
||||
self::DATE => $this->validatorDate($value),
|
||||
self::DATE_TIME => $this->validateDatetime($value),
|
||||
self::TIME => $this->validatorTime($value),
|
||||
self::STR_TO_TIME => $this->validatorTimestamp($value),
|
||||
self::DATE => $this->validatorDate($field, $value),
|
||||
self::DATE_TIME => $this->validateDatetime($field, $value),
|
||||
self::TIME => $this->validatorTime($field, $value),
|
||||
self::STR_TO_TIME => $this->validatorTimestamp($field, $value),
|
||||
default => true,
|
||||
};
|
||||
}, $this->params, strtolower($this->method));
|
||||
@@ -48,16 +48,16 @@ class DateTimeValidator extends BaseValidator
|
||||
*
|
||||
* 效验分秒 格式如 01:02 or 01-02
|
||||
*/
|
||||
public function validatorTime($value): bool
|
||||
public function validatorTime($field, $value): bool
|
||||
{
|
||||
if (!is_string($value)) {
|
||||
return $this->addError('The param :attribute not is a date value');
|
||||
return $this->addError($field, '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');
|
||||
return $this->addError($field, 'The param :attribute format error');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,17 +68,17 @@ class DateTimeValidator extends BaseValidator
|
||||
*
|
||||
* 效验分秒 格式如 2017-12-22 01:02
|
||||
*/
|
||||
public function validateDatetime($value): bool
|
||||
public function validateDatetime($field, $value): bool
|
||||
{
|
||||
if (!is_string($value)) {
|
||||
return $this->addError('The param :attribute not is a date value');
|
||||
return $this->addError($field, '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');
|
||||
return $this->addError($field, 'The param :attribute format error');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,16 +88,16 @@ class DateTimeValidator extends BaseValidator
|
||||
*
|
||||
* 效验分秒 格式如 2017-12-22
|
||||
*/
|
||||
public function validatorDate($value): bool
|
||||
public function validatorDate($field, $value): bool
|
||||
{
|
||||
if (!is_string($value)) {
|
||||
return $this->addError('The param :attribute not is a date value');
|
||||
return $this->addError($field, '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');
|
||||
return $this->addError($field, 'The param :attribute format error');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,16 +107,16 @@ class DateTimeValidator extends BaseValidator
|
||||
*
|
||||
* 效验时间戳 格式如 1521452254
|
||||
*/
|
||||
public function validatorTimestamp($value): bool
|
||||
public function validatorTimestamp($field, $value): bool
|
||||
{
|
||||
if (!is_numeric($value)) {
|
||||
return $this->addError('The param :attribute not is a timestamp value');
|
||||
return $this->addError($field, 'The param :attribute not is a timestamp value');
|
||||
}
|
||||
if (strlen((string)$value) != 10) {
|
||||
return $this->addError('The param :attribute not is a timestamp value');
|
||||
return $this->addError($field, 'The param :attribute not is a timestamp value');
|
||||
}
|
||||
if (!date('YmdHis', $value)) {
|
||||
return $this->addError('The param :attribute format error');
|
||||
return $this->addError($field, 'The param :attribute format error');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user