From 9e9efb22158b81926241d2dabbfc439484aeaab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Fri, 21 Mar 2025 18:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/helper/ValidateHelper.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugin/think-library/src/helper/ValidateHelper.php b/plugin/think-library/src/helper/ValidateHelper.php index 46a4b12ae..2fa86a7fd 100644 --- a/plugin/think-library/src/helper/ValidateHelper.php +++ b/plugin/think-library/src/helper/ValidateHelper.php @@ -50,21 +50,21 @@ class ValidateHelper extends Helper $input = $this->app->request->$type(); } [$data, $rule, $info] = [[], [], []]; - foreach ($rules as $name => $message) { - if (is_numeric($name)) { - [$name, $alias] = explode('#', $message . '#'); - $data[$name] = $input[$alias ?: $name] ?? null; - } elseif (strpos($name, '.') === false) { - $data[$name] = $message; - } elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name . '#', $matches)) { + foreach ($rules as $key => $value) { + if (is_numeric($key)) { + [$key, $alias] = explode('#', "{$value}#"); + $data[$key] = $input[$alias ?: $key] ?? null; + } elseif (strpos($key, '.') === false) { + $data[$key] = $value; + } elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', "{$key}#", $matches)) { [, $_key, $_rule, $alias] = $matches; if (in_array($_rule, ['value', 'default'])) { - if ($_rule === 'value') $data[$_key] = $message; - elseif ($_rule === 'default') $data[$_key] = $input[$alias ?: $_key] ?? $message; + if ($_rule === 'value') $data[$_key] = $value; + if ($_rule === 'default') $data[$_key] = $input[$alias ?: $_key] ?? $value; } else { - $info[explode(':', $_key . '.' . $_rule)[0]] = $message; + $info[explode(':', "{$_key}.{$_rule}")[0]] = $value; $data[$_key] = $data[$_key] ?? ($input[$alias ?: $_key] ?? null); - $rule[$_key] = isset($rule[$_key]) ? $rule[$_key] . '|' . $_rule : $_rule; + $rule[$_key] = isset($rule[$_key]) ? "{$rule[$_key]}|{$_rule}" : $_rule; } } }