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

eee

Browse Source
This commit is contained in:
whwyy
2023-12-18 02:25:34 +08:00
parent cf3aad6001
commit f17381c4de
7 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Validator/Validator.php
+3 -8
View File
@@ -120,18 +120,13 @@ class Validator
foreach ($this->rules as $name => $rules) {
/** @var array<array<TypesProxy,string>> $typeValidator */
$typeValidator = array_pop($rules);
$key = $this->alias[$name];
if (!isset($params[$key])) {
if ($rules[0] instanceof RequiredValidatorFilter) {
if (!isset($params[$name])) {
if (!empty($rules) && $rules[0] instanceof RequiredValidatorFilter) {
return $this->addError('The request field ' . $name . ' is mandatory and indispensable');
}
if (!$typeValidator[0]->allowsNull) {
return $this->addError('The request field ' . $name . ' parameter cannot be null');
}
$params[$key] = null;
}
if (!call_user_func($typeValidator, $this->formData, $name, $params[$key])) {
if (!call_user_func($typeValidator, $this->formData, $name, $params[$name] ?? null)) {
return $this->addError('The parameter type used in the request field ' . $name . ' is incorrect');
}