@@ -14,8 +14,8 @@ |
||
| 14 | 14 | |
| 15 | 15 | public function join(string $separator = ' '): string |
| 16 | 16 | { |
| 17 | - return implode($separator, \array_map(function ($item) { |
|
| 18 | - return \is_array($item) ? '['.\implode(', ', $item).']' : $item; |
|
| 17 | + return implode($separator, \array_map(function($item) { |
|
| 18 | + return \is_array($item) ? '[' . \implode(', ', $item) . ']' : $item; |
|
| 19 | 19 | }, $this->items)); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | ->noPunctuation() |
| 67 | 67 | ->when($asName, fn ($c) => $c->surname()) |
| 68 | 68 | ->convert($string) |
| 69 | - ->map(function ($pinyin) { |
|
| 69 | + ->map(function($pinyin) { |
|
| 70 | 70 | // 常用于电影名称入库索引处理,例如:《晚娘2012》-> WN2012 |
| 71 | 71 | return \is_numeric($pinyin) || preg_match('/\d{2,}/', $pinyin) ? $pinyin : \mb_substr($pinyin, 0, 1); |
| 72 | 72 | }); |
@@ -5,9 +5,9 @@ discard block |
||
| 5 | 5 | class Converter |
| 6 | 6 | { |
| 7 | 7 | private const SEGMENTS_COUNT = 10; |
| 8 | - private const WORDS_PATH = __DIR__.'/../data/words-%s.php'; |
|
| 9 | - private const CHARS_PATH = __DIR__.'/../data/chars.php'; |
|
| 10 | - private const SURNAMES_PATH = __DIR__.'/../data/surnames.php'; |
|
| 8 | + private const WORDS_PATH = __DIR__ . '/../data/words-%s.php'; |
|
| 9 | + private const CHARS_PATH = __DIR__ . '/../data/chars.php'; |
|
| 10 | + private const SURNAMES_PATH = __DIR__ . '/../data/surnames.php'; |
|
| 11 | 11 | |
| 12 | 12 | public const TONE_STYLE_DEFAULT = 'default'; |
| 13 | 13 | public const TONE_STYLE_NUMBER = 'number'; |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | public function convert(string $string, callable $beforeSplit = null): Collection |
| 143 | 143 | { |
| 144 | 144 | // 把原有的数字和汉字分离,避免拼音转换时被误作声调 |
| 145 | - $string = preg_replace_callback('~[a-z0-9_-]+~i', function ($matches) { |
|
| 145 | + $string = preg_replace_callback('~[a-z0-9_-]+~i', function($matches) { |
|
| 146 | 146 | return "\t" . $matches[0]; |
| 147 | 147 | }, $string); |
| 148 | 148 | |