@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\middleware; |
14 | 14 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\contract; |
14 | 14 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\contract; |
14 | 14 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: yunwuxin <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\filesystem\driver; |
14 | 14 |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: yunwuxin <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think; |
14 | 14 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | protected function loadRoutesFrom($path) |
38 | 38 | { |
39 | - $this->registerRoutes(function () use ($path) { |
|
39 | + $this->registerRoutes(function() use ($path) { |
|
40 | 40 | include $path; |
41 | 41 | }); |
42 | 42 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | { |
60 | 60 | $commands = is_array($commands) ? $commands : func_get_args(); |
61 | 61 | |
62 | - Console::starting(function (Console $console) use ($commands) { |
|
62 | + Console::starting(function(Console $console) use ($commands) { |
|
63 | 63 | $console->addCommands($commands); |
64 | 64 | }); |
65 | 65 | } |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\route; |
14 | 14 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | if ($this->parent && $this->parent->getFullName()) { |
112 | - $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : ''); |
|
112 | + $this->fullName = $this->parent->getFullName().($this->name ? '/'.$this->name : ''); |
|
113 | 113 | } else { |
114 | 114 | $this->fullName = $this->name; |
115 | 115 | } |
@@ -304,13 +304,13 @@ discard block |
||
304 | 304 | protected function checkMergeRuleRegex(Request $request, array &$rules, string $url, bool $completeMatch) |
305 | 305 | { |
306 | 306 | $depr = $this->router->config('pathinfo_depr'); |
307 | - $url = $depr . str_replace('|', $depr, $url); |
|
307 | + $url = $depr.str_replace('|', $depr, $url); |
|
308 | 308 | $regex = []; |
309 | 309 | $items = []; |
310 | 310 | |
311 | 311 | foreach ($rules as $key => $item) { |
312 | 312 | if ($item instanceof RuleItem) { |
313 | - $rule = $depr . str_replace('/', $depr, $item->getRule()); |
|
313 | + $rule = $depr.str_replace('/', $depr, $item->getRule()); |
|
314 | 314 | if ($depr == $rule && $depr != $url) { |
315 | 315 | unset($rules[$key]); |
316 | 316 | continue; |
@@ -327,21 +327,21 @@ discard block |
||
327 | 327 | continue; |
328 | 328 | } |
329 | 329 | |
330 | - $slash = preg_quote('/-' . $depr, '/'); |
|
330 | + $slash = preg_quote('/-'.$depr, '/'); |
|
331 | 331 | |
332 | - if ($matchRule = preg_split('/[' . $slash . ']<\w+\??>/', $rule, 2)) { |
|
332 | + if ($matchRule = preg_split('/['.$slash.']<\w+\??>/', $rule, 2)) { |
|
333 | 333 | if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) { |
334 | 334 | unset($rules[$key]); |
335 | 335 | continue; |
336 | 336 | } |
337 | 337 | } |
338 | 338 | |
339 | - if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) { |
|
339 | + if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) { |
|
340 | 340 | unset($rules[$key]); |
341 | 341 | $pattern = array_merge($this->getPattern(), $item->getPattern()); |
342 | 342 | $option = array_merge($this->getOption(), $item->getOption()); |
343 | 343 | |
344 | - $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key); |
|
344 | + $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_'.$key); |
|
345 | 345 | $items[$key] = $item; |
346 | 346 | } |
347 | 347 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | try { |
355 | - $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match); |
|
355 | + $result = preg_match('/^(?:'.implode('|', $regex).')/u', $url, $match); |
|
356 | 356 | } catch (\Exception $e) { |
357 | 357 | throw new Exception('route pattern error'); |
358 | 358 | } |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | |
370 | 370 | if (!isset($pos)) { |
371 | 371 | foreach ($regex as $key => $item) { |
372 | - if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) { |
|
372 | + if (0 === strpos(str_replace(['\/', '\-', '\\'.$depr], ['/', '-', $depr], $item), $match[0])) { |
|
373 | 373 | $pos = $key; |
374 | 374 | break; |
375 | 375 | } |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | * @access public |
399 | 399 | * @return RuleItem|null |
400 | 400 | */ |
401 | - public function getMissRule(): ? RuleItem |
|
401 | + public function getMissRule(): ? RuleItem |
|
402 | 402 | { |
403 | 403 | return $this->miss; |
404 | 404 | } |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | public function prefix(string $prefix) |
485 | 485 | { |
486 | 486 | if ($this->parent && $this->parent->getOption('prefix')) { |
487 | - $prefix = $this->parent->getOption('prefix') . $prefix; |
|
487 | + $prefix = $this->parent->getOption('prefix').$prefix; |
|
488 | 488 | } |
489 | 489 | |
490 | 490 | return $this->setOption('prefix', $prefix); |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\route; |
14 | 14 | |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | $item = []; |
110 | 110 | |
111 | 111 | foreach ($array as $val) { |
112 | - $item[] = $val . '/<' . ($option['var'][$val] ?? $val . '_id') . '>'; |
|
112 | + $item[] = $val.'/<'.($option['var'][$val] ?? $val.'_id').'>'; |
|
113 | 113 | } |
114 | 114 | |
115 | - $rule = implode('/', $item) . '/' . $last; |
|
115 | + $rule = implode('/', $item).'/'.$last; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | $prefix = substr($rule, strlen($this->name) + 1); |
@@ -125,12 +125,12 @@ discard block |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) { |
128 | - $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]); |
|
128 | + $val[1] = str_replace('<id>', '<'.$option['var'][$last].'>', $val[1]); |
|
129 | 129 | } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) { |
130 | - $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]); |
|
130 | + $val[1] = str_replace('<id>', '<'.$option['var'][$rule].'>', $val[1]); |
|
131 | 131 | } |
132 | 132 | |
133 | - $ruleItem = $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]); |
|
133 | + $ruleItem = $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]); |
|
134 | 134 | |
135 | 135 | foreach (['model', 'validate', 'middleware'] as $name) { |
136 | 136 | if (isset($this->$name[$key])) { |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | namespace think\exception; |
13 | 13 | |
14 | 14 | use Psr\Cache\InvalidArgumentException as Psr6CacheInvalidArgumentInterface; |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think; |
14 | 14 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | public function getConfig(string $name = null, $default = null) |
57 | 57 | { |
58 | 58 | if (!is_null($name)) { |
59 | - return $this->app->config->get('log.' . $name, $default); |
|
59 | + return $this->app->config->get('log.'.$name, $default); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | return $this->app->config->get('log'); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function record($msg, string $type = 'info', array $context = [], bool $lazy = true) |
182 | 182 | { |
183 | - $channel = $this->getConfig('type_channel.' . $type); |
|
183 | + $channel = $this->getConfig('type_channel.'.$type); |
|
184 | 184 | |
185 | 185 | $this->channel($channel)->record($msg, $type, $context, $lazy); |
186 | 186 |