@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: zhangyajun <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think; |
14 | 14 | |
@@ -184,10 +184,10 @@ discard block |
||
184 | 184 | |
185 | 185 | $url = $path; |
186 | 186 | if (!empty($parameters)) { |
187 | - $url .= '?' . http_build_query($parameters, '', '&'); |
|
187 | + $url .= '?'.http_build_query($parameters, '', '&'); |
|
188 | 188 | } |
189 | 189 | |
190 | - return $url . $this->buildFragment(); |
|
190 | + return $url.$this->buildFragment(); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | /** |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | */ |
337 | 337 | protected function buildFragment(): string |
338 | 338 | { |
339 | - return $this->options['fragment'] ? '#' . $this->options['fragment'] : ''; |
|
339 | + return $this->options['fragment'] ? '#'.$this->options['fragment'] : ''; |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | if ($this->app->config->get('log.record_trace')) { |
75 | - $log .= PHP_EOL . $exception->getTraceAsString(); |
|
75 | + $log .= PHP_EOL.$exception->getTraceAsString(); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $this->app->log->record($log, 'error'); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | ob_start(); |
205 | 205 | extract($data); |
206 | - include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl'; |
|
206 | + include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl'; |
|
207 | 207 | |
208 | 208 | // 获取并清空缓存 |
209 | 209 | $data = ob_get_clean(); |
@@ -257,10 +257,10 @@ discard block |
||
257 | 257 | |
258 | 258 | if (strpos($message, ':')) { |
259 | 259 | $name = strstr($message, ':', true); |
260 | - $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message; |
|
260 | + $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message; |
|
261 | 261 | } elseif (strpos($message, ',')) { |
262 | 262 | $name = strstr($message, ',', true); |
263 | - $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message; |
|
263 | + $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message; |
|
264 | 264 | } elseif ($lang->has($message)) { |
265 | 265 | $message = $lang->get($message); |
266 | 266 | } |
@@ -48,7 +48,7 @@ |
||
48 | 48 | if (0 !== strpos($data, '<?xml')) { |
49 | 49 | $encoding = $this->options['encoding']; |
50 | 50 | $xml = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>"; |
51 | - $data = $xml . $data; |
|
51 | + $data = $xml.$data; |
|
52 | 52 | } |
53 | 53 | return $data; |
54 | 54 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | throw new \InvalidArgumentException(json_last_error_msg()); |
58 | 58 | } |
59 | 59 | |
60 | - $data = $handler . '(' . $data . ');'; |
|
60 | + $data = $handler.'('.$data.');'; |
|
61 | 61 | |
62 | 62 | return $data; |
63 | 63 | } catch (\Exception $e) { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | protected function output($data) |
35 | 35 | { |
36 | 36 | if (!$this->isContent && !is_file($data)) { |
37 | - throw new Exception('file not exists:' . $data); |
|
37 | + throw new Exception('file not exists:'.$data); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | ob_end_clean(); |
@@ -55,13 +55,13 @@ discard block |
||
55 | 55 | |
56 | 56 | $this->header['Pragma'] = 'public'; |
57 | 57 | $this->header['Content-Type'] = $mimeType ?: 'application/octet-stream'; |
58 | - $this->header['Cache-control'] = 'max-age=' . $this->expire; |
|
59 | - $this->header['Content-Disposition'] = 'attachment; filename="' . $name . '"'; |
|
58 | + $this->header['Cache-control'] = 'max-age='.$this->expire; |
|
59 | + $this->header['Content-Disposition'] = 'attachment; filename="'.$name.'"'; |
|
60 | 60 | $this->header['Content-Length'] = $size; |
61 | 61 | $this->header['Content-Transfer-Encoding'] = 'binary'; |
62 | - $this->header['Expires'] = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT'; |
|
62 | + $this->header['Expires'] = gmdate("D, d M Y H:i:s", time() + $this->expire).' GMT'; |
|
63 | 63 | |
64 | - $this->lastModified(gmdate('D, d M Y H:i:s', time()) . ' GMT'); |
|
64 | + $this->lastModified(gmdate('D, d M Y H:i:s', time()).' GMT'); |
|
65 | 65 | |
66 | 66 | return $this->isContent ? $data : file_get_contents($data); |
67 | 67 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $this->name = $filename; |
132 | 132 | |
133 | 133 | if ($extension && false === strpos($filename, '.')) { |
134 | - $this->name .= '.' . pathinfo($this->data, PATHINFO_EXTENSION); |
|
134 | + $this->name .= '.'.pathinfo($this->data, PATHINFO_EXTENSION); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | return $this; |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: 麦当苗儿 <[email protected]> <http://zjzit.cn> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\initializer; |
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\initializer; |
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\initializer; |
14 | 14 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | public function init(App $app) |
33 | 33 | { |
34 | - $file = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'services.php'; |
|
34 | + $file = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'services.php'; |
|
35 | 35 | |
36 | 36 | $services = $this->services; |
37 | 37 |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | // +---------------------------------------------------------------------- |
7 | 7 | // | Author: zhangyajun <[email protected]> |
8 | 8 | // +---------------------------------------------------------------------- |
9 | -declare (strict_types = 1); |
|
9 | +declare(strict_types=1); |
|
10 | 10 | |
11 | 11 | namespace think; |
12 | 12 | |
@@ -469,10 +469,10 @@ discard block |
||
469 | 469 | public function findNamespace(string $namespace): string |
470 | 470 | { |
471 | 471 | $allNamespaces = $this->getNamespaces(); |
472 | - $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { |
|
473 | - return preg_quote($matches[1]) . '[^:]*'; |
|
472 | + $expr = preg_replace_callback('{([^:]+|)}', function($matches) { |
|
473 | + return preg_quote($matches[1]).'[^:]*'; |
|
474 | 474 | }, $namespace); |
475 | - $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces); |
|
475 | + $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces); |
|
476 | 476 | |
477 | 477 | if (empty($namespaces)) { |
478 | 478 | $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace); |
@@ -509,13 +509,13 @@ discard block |
||
509 | 509 | { |
510 | 510 | $allCommands = array_keys($this->commands); |
511 | 511 | |
512 | - $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { |
|
513 | - return preg_quote($matches[1]) . '[^:]*'; |
|
512 | + $expr = preg_replace_callback('{([^:]+|)}', function($matches) { |
|
513 | + return preg_quote($matches[1]).'[^:]*'; |
|
514 | 514 | }, $name); |
515 | 515 | |
516 | - $commands = preg_grep('{^' . $expr . '}', $allCommands); |
|
516 | + $commands = preg_grep('{^'.$expr.'}', $allCommands); |
|
517 | 517 | |
518 | - if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) { |
|
518 | + if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) { |
|
519 | 519 | if (false !== $pos = strrpos($name, ':')) { |
520 | 520 | $this->findNamespace(substr($name, 0, $pos)); |
521 | 521 | } |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | } |
710 | 710 | } |
711 | 711 | |
712 | - $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { |
|
712 | + $alternatives = array_filter($alternatives, function($lev) use ($threshold) { |
|
713 | 713 | return $lev < 2 * $threshold; |
714 | 714 | }); |
715 | 715 | asort($alternatives); |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | |
731 | 731 | foreach ($parts as $part) { |
732 | 732 | if (count($namespaces)) { |
733 | - $namespaces[] = end($namespaces) . ':' . $part; |
|
733 | + $namespaces[] = end($namespaces).':'.$part; |
|
734 | 734 | } else { |
735 | 735 | $namespaces[] = $part; |
736 | 736 | } |