chore: Добавлены аннотации к типам
This commit is contained in:
parent
48269bd424
commit
ad920f656c
14 changed files with 127 additions and 127 deletions
|
|
@ -17,7 +17,7 @@ class Validator
|
|||
|
||||
/**
|
||||
* Поля по умолчанию
|
||||
* @var array<string, class-string<Rule\AbstractRule>>
|
||||
* @var array<string, class-string<AbstractRule>>
|
||||
*/
|
||||
protected $type = [
|
||||
'date' => Rule\Date::class,
|
||||
|
|
@ -43,9 +43,9 @@ class Validator
|
|||
/**
|
||||
* Добавление правила в список
|
||||
* @param string $name
|
||||
* @param class-string<Rule\AbstractRule> $className
|
||||
* @param class-string<AbstractRule> $className
|
||||
*/
|
||||
function addRuleType(string $name, string $className) {
|
||||
function addRuleType(string $name, string $className): void {
|
||||
$this->type[$name] = $className;
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ class Validator
|
|||
/**
|
||||
* @param AbstractRule $rule
|
||||
*/
|
||||
public function skip($rule, Collection $container) // -> Rule_Abstract
|
||||
public function skip($rule, Collection $container): bool
|
||||
{
|
||||
if ($rule->skipEmpty()) {
|
||||
$data = $container->get($rule->field);
|
||||
|
|
@ -111,7 +111,7 @@ class Validator
|
|||
return false;
|
||||
}
|
||||
|
||||
function reset() {
|
||||
function reset(): void {
|
||||
$this->errorMsg = [];
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ class Validator
|
|||
if ($rule) {
|
||||
$this->chain = $rule;
|
||||
}
|
||||
// $this->errorMsg = [];
|
||||
|
||||
foreach ($this->chain as $rule) {
|
||||
//echo $key;
|
||||
if (!in_array($rule->field, $fields) && !$this->skip($rule, $container) && !$rule->isValid($container, $status)) {
|
||||
|
|
@ -133,17 +133,17 @@ class Validator
|
|||
return $this->isValid();
|
||||
}
|
||||
|
||||
public function addError($name, $message)
|
||||
public function addError(string $name, string $message)
|
||||
{
|
||||
$this->errorMsg[$name] = $message;
|
||||
}
|
||||
|
||||
public function isError()
|
||||
public function isError(): bool
|
||||
{
|
||||
return !empty($this->errorMsg);
|
||||
}
|
||||
|
||||
public function isValid()
|
||||
public function isValid(): bool
|
||||
{
|
||||
return empty($this->errorMsg);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue