Skip to content

Commit cec75fa

Browse files
committed
fix: 修改别名时的 info 提示
1 parent 90b0898 commit cec75fa

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/helper/ValidateHelper.php

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,22 @@ public function init(array $rules, $input = '', ?callable $callable = null)
5050
$input = $this->app->request->$type();
5151
}
5252
[$data, $rule, $info] = [[], [], []];
53-
foreach ($rules as $name => $message) if (is_numeric($name)) {
54-
[$name, $alias] = explode('#', $message . '#');
55-
$data[$name] = $input[($alias ?: $name)] ?? null;
56-
} elseif (strpos($name, '.') === false) {
57-
$data[$name] = $message;
58-
} elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name . '#', $matches)) {
59-
[, $_key, $_rule, $alias] = $matches;
60-
if (in_array($_rule, ['value', 'default'])) {
61-
if ($_rule === 'value') $data[$_key] = $message;
62-
elseif ($_rule === 'default') $data[$_key] = $input[($alias ?: $_key)] ?? $message;
63-
} else {
64-
$info[explode(':', $name)[0]] = $message;
65-
$data[$_key] = $data[$_key] ?? ($input[($alias ?: $_key)] ?? null);
66-
$rule[$_key] = isset($rule[$_key]) ? ($rule[$_key] . '|' . $_rule) : $_rule;
53+
foreach ($rules as $name => $message) {
54+
if (is_numeric($name)) {
55+
[$name, $alias] = explode('#', $message . '#');
56+
$data[$name] = $input[$alias ?: $name] ?? null;
57+
} elseif (strpos($name, '.') === false) {
58+
$data[$name] = $message;
59+
} elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name . '#', $matches)) {
60+
[, $_key, $_rule, $alias] = $matches;
61+
if (in_array($_rule, ['value', 'default'])) {
62+
if ($_rule === 'value') $data[$_key] = $message;
63+
elseif ($_rule === 'default') $data[$_key] = $input[$alias ?: $_key] ?? $message;
64+
} else {
65+
$info[explode(':', $_key . '.' . $_rule)[0]] = $message;
66+
$data[$_key] = $data[$_key] ?? ($input[$alias ?: $_key] ?? null);
67+
$rule[$_key] = isset($rule[$_key]) ? $rule[$_key] . '|' . $_rule : $_rule;
68+
}
6769
}
6870
}
6971
$validate = new Validate();

0 commit comments

Comments
 (0)