@@ -17,7 +17,7 @@ |
||
| 17 | 17 | // | Packagist 地址 :https://packagist.org/packages/liguangchun/think-library |
| 18 | 18 | // +---------------------------------------------------------------------- |
| 19 | 19 | |
| 20 | -declare (strict_types=1); |
|
| 20 | +declare(strict_types=1); |
|
| 21 | 21 | |
| 22 | 22 | namespace DtApp\ThinkLibrary; |
| 23 | 23 | |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | [$data, $rule, $info] = [[], [], []]; |
| 49 | 49 | foreach ($rules as $name => $message) { |
| 50 | 50 | if (is_numeric($name)) { |
| 51 | - [$name, $alias] = explode('#', $message . '#'); |
|
| 51 | + [$name, $alias] = explode('#', $message.'#'); |
|
| 52 | 52 | $data[$name] = $input[($alias ?: $name)] ?? null; |
| 53 | 53 | } elseif (strpos($name, '.') === false) { |
| 54 | 54 | $data[$name] = $message; |
| 55 | - } elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name . '#', $matches)) { |
|
| 55 | + } elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name.'#', $matches)) { |
|
| 56 | 56 | [, $_key, $_rule, $alias] = $matches; |
| 57 | 57 | if (in_array($_rule, ['value', 'default'])) { |
| 58 | 58 | if ($_rule === 'value') { |
@@ -60,10 +60,10 @@ discard block |
||
| 60 | 60 | } elseif ($_rule === 'default') { |
| 61 | 61 | $data[$_key] = $input[($alias ?: $_key)] ?? $message; |
| 62 | 62 | } |
| 63 | - } else { |
|
| 63 | + }else { |
|
| 64 | 64 | $info[explode(':', $name)[0]] = $message; |
| 65 | 65 | $data[$_key] = $data[$_key] ?? ($input[($alias ?: $_key)] ?? null); |
| 66 | - $rule[$_key] = isset($rule[$_key]) ? ($rule[$_key] . '|' . $_rule) : $_rule; |
|
| 66 | + $rule[$_key] = isset($rule[$_key]) ? ($rule[$_key].'|'.$_rule) : $_rule; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |