@@ -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,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 | |
@@ -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\log\driver; |
| 14 | 14 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | if (empty($this->config['path'])) { |
| 51 | - $this->config['path'] = $app->getRuntimePath() . 'log'; |
|
| 51 | + $this->config['path'] = $app->getRuntimePath().'log'; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | if (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) { |
@@ -82,8 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $message[] = $this->config['json'] ? |
| 85 | - json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) : |
|
| 86 | - sprintf($this->config['format'], $time, $type, $msg); |
|
| 85 | + json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) : sprintf($this->config['format'], $time, $type, $msg); |
|
| 87 | 86 | } |
| 88 | 87 | |
| 89 | 88 | if (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level'])) { |
@@ -121,7 +120,7 @@ discard block |
||
| 121 | 120 | $info[$type] = is_array($msg) ? implode(PHP_EOL, $msg) : $msg; |
| 122 | 121 | } |
| 123 | 122 | |
| 124 | - $message = implode(PHP_EOL, $info) . PHP_EOL; |
|
| 123 | + $message = implode(PHP_EOL, $info).PHP_EOL; |
|
| 125 | 124 | |
| 126 | 125 | return error_log($message, 3, $destination); |
| 127 | 126 | } |
@@ -135,7 +134,7 @@ discard block |
||
| 135 | 134 | { |
| 136 | 135 | |
| 137 | 136 | if ($this->config['max_files']) { |
| 138 | - $files = glob($this->config['path'] . '*.log'); |
|
| 137 | + $files = glob($this->config['path'].'*.log'); |
|
| 139 | 138 | |
| 140 | 139 | try { |
| 141 | 140 | if (count($files) > $this->config['max_files']) { |
@@ -148,16 +147,16 @@ discard block |
||
| 148 | 147 | |
| 149 | 148 | if ($this->config['single']) { |
| 150 | 149 | $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; |
| 151 | - $destination = $this->config['path'] . $name . '.log'; |
|
| 150 | + $destination = $this->config['path'].$name.'.log'; |
|
| 152 | 151 | } else { |
| 153 | 152 | |
| 154 | 153 | if ($this->config['max_files']) { |
| 155 | - $filename = date('Ymd') . '.log'; |
|
| 154 | + $filename = date('Ymd').'.log'; |
|
| 156 | 155 | } else { |
| 157 | - $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . '.log'; |
|
| 156 | + $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').'.log'; |
|
| 158 | 157 | } |
| 159 | 158 | |
| 160 | - $destination = $this->config['path'] . $filename; |
|
| 159 | + $destination = $this->config['path'].$filename; |
|
| 161 | 160 | } |
| 162 | 161 | |
| 163 | 162 | return $destination; |
@@ -176,14 +175,14 @@ discard block |
||
| 176 | 175 | if ($this->config['single']) { |
| 177 | 176 | $name = is_string($this->config['single']) ? $this->config['single'] : 'single'; |
| 178 | 177 | |
| 179 | - $name .= '_' . $type; |
|
| 178 | + $name .= '_'.$type; |
|
| 180 | 179 | } elseif ($this->config['max_files']) { |
| 181 | - $name = date('Ymd') . '_' . $type; |
|
| 180 | + $name = date('Ymd').'_'.$type; |
|
| 182 | 181 | } else { |
| 183 | - $name = date('d') . '_' . $type; |
|
| 182 | + $name = date('d').'_'.$type; |
|
| 184 | 183 | } |
| 185 | 184 | |
| 186 | - return $path . DIRECTORY_SEPARATOR . $name . '.log'; |
|
| 185 | + return $path.DIRECTORY_SEPARATOR.$name.'.log'; |
|
| 187 | 186 | } |
| 188 | 187 | |
| 189 | 188 | /** |
@@ -196,7 +195,7 @@ discard block |
||
| 196 | 195 | { |
| 197 | 196 | if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) { |
| 198 | 197 | try { |
| 199 | - rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination)); |
|
| 198 | + rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination)); |
|
| 200 | 199 | } catch (\Exception $e) { |
| 201 | 200 | // |
| 202 | 201 | } |
@@ -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 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | public function getConfig(string $name = null, $default = null) |
| 47 | 47 | { |
| 48 | 48 | if (!is_null($name)) { |
| 49 | - return $this->app->config->get('cache.' . $name, $default); |
|
| 49 | + return $this->app->config->get('cache.'.$name, $default); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | return $this->app->config->get('cache'); |
@@ -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\cache\driver; |
| 14 | 14 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | if (empty($this->options['path'])) { |
| 51 | - $this->options['path'] = $app->getRuntimePath() . 'cache'; |
|
| 51 | + $this->options['path'] = $app->getRuntimePath().'cache'; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | if (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) { |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | if ($this->options['cache_subdir']) { |
| 70 | 70 | // 使用子目录 |
| 71 | - $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2); |
|
| 71 | + $name = substr($name, 0, 2).DIRECTORY_SEPARATOR.substr($name, 2); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | if ($this->options['prefix']) { |
| 75 | - $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name; |
|
| 75 | + $name = $this->options['prefix'].DIRECTORY_SEPARATOR.$name; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - return $this->options['path'] . $name . '.php'; |
|
| 78 | + return $this->options['path'].$name.'.php'; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $data = gzcompress($data, 3); |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - $data = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data; |
|
| 184 | + $data = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data; |
|
| 185 | 185 | $result = file_put_contents($filename, $data); |
| 186 | 186 | |
| 187 | 187 | if ($result) { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | { |
| 251 | 251 | $this->writeTimes++; |
| 252 | 252 | |
| 253 | - $dirname = $this->options['path'] . $this->options['prefix']; |
|
| 253 | + $dirname = $this->options['path'].$this->options['prefix']; |
|
| 254 | 254 | |
| 255 | 255 | $this->rmdir($dirname); |
| 256 | 256 | |
@@ -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\console; |
| 14 | 14 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $array[] = str_repeat($style[1], $width + 2); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - return $style[0] . implode($style[2], $array) . $style[3] . PHP_EOL; |
|
| 210 | + return $style[0].implode($style[2], $array).$style[3].PHP_EOL; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | /** |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | $content = $this->renderSeparator('top'); |
| 222 | 222 | |
| 223 | 223 | foreach ($this->header as $key => $header) { |
| 224 | - $array[] = ' ' . str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign); |
|
| 224 | + $array[] = ' '.str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | if (!empty($array)) { |
| 228 | - $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL; |
|
| 228 | + $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL; |
|
| 229 | 229 | |
| 230 | 230 | if (!empty($this->rows)) { |
| 231 | 231 | $content .= $this->renderSeparator('middle'); |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | $content .= $this->renderSeparator('middle'); |
| 269 | 269 | } elseif (is_scalar($row)) { |
| 270 | 270 | $content .= $this->renderSeparator('cross-top'); |
| 271 | - $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function ($a, $b) { |
|
| 271 | + $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function($a, $b) { |
|
| 272 | 272 | return $a + $b; |
| 273 | 273 | }); |
| 274 | 274 | $array = str_pad($row, $width); |
| 275 | 275 | |
| 276 | - $content .= $style[0] . ' ' . $array . ' ' . $style[3] . PHP_EOL; |
|
| 276 | + $content .= $style[0].' '.$array.' '.$style[3].PHP_EOL; |
|
| 277 | 277 | $content .= $this->renderSeparator('cross-bottom'); |
| 278 | 278 | } else { |
| 279 | 279 | $array = []; |
@@ -285,10 +285,10 @@ discard block |
||
| 285 | 285 | if (false !== $encoding = mb_detect_encoding((string) $val, null, true)) { |
| 286 | 286 | $width += strlen((string) $val) - mb_strwidth((string) $val, $encoding); |
| 287 | 287 | } |
| 288 | - $array[] = ' ' . str_pad((string) $val, $width, ' ', $this->cellAlign); |
|
| 288 | + $array[] = ' '.str_pad((string) $val, $width, ' ', $this->cellAlign); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | - $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL; |
|
| 291 | + $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL; |
|
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | } |