From e26439a43906edce6fee779b8143d77edbf43af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 30 Oct 2020 10:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Validator/BaseValidator.php | 12 ++++++------ Validator/DateTimeValidator.php | 4 ++-- Validator/EmptyValidator.php | 4 ++-- Validator/LengthValidator.php | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Validator/BaseValidator.php b/Validator/BaseValidator.php index 230e1325..af49b13a 100644 --- a/Validator/BaseValidator.php +++ b/Validator/BaseValidator.php @@ -9,20 +9,20 @@ use Database\ActiveRecord; abstract class BaseValidator { - public $field; + public string $field = ''; - public $rules; + public array $rules = []; public string $method; - protected $isFail = TRUE; + protected bool $isFail = TRUE; - protected $message = ''; + protected string $message = ''; - protected $params = []; + protected array $params = []; /** @var ActiveRecord */ - protected $model; + protected ActiveRecord $model; public function setModel($model) { diff --git a/Validator/DateTimeValidator.php b/Validator/DateTimeValidator.php index bfdeb21f..9c5e96a4 100644 --- a/Validator/DateTimeValidator.php +++ b/Validator/DateTimeValidator.php @@ -17,8 +17,8 @@ class DateTimeValidator extends BaseValidator const DATE_TIME = 'datetime'; const TIME = 'time'; const STR_TO_TIME = 'timestamp'; - - public $method; + + public string $method; /** * @return bool diff --git a/Validator/EmptyValidator.php b/Validator/EmptyValidator.php index 56550403..69e885a6 100644 --- a/Validator/EmptyValidator.php +++ b/Validator/EmptyValidator.php @@ -20,8 +20,8 @@ class EmptyValidator extends BaseValidator /** @var string [可为空, 不能为null] */ const CAN_NOT_NULL = 'not null'; - - public $method; + + public string $method; /** * @return bool diff --git a/Validator/LengthValidator.php b/Validator/LengthValidator.php index ce7227b4..d4cfade7 100644 --- a/Validator/LengthValidator.php +++ b/Validator/LengthValidator.php @@ -16,7 +16,7 @@ class LengthValidator extends BaseValidator const MAX_LENGTH = 'max'; const MIN_LENGTH = 'min'; - public $method; + public string $method; public int $value;