@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $spacingWidth = $totalWidth - strlen($argument->getName()) + 2; |
87 | 87 | |
88 | 88 | $this->writeText(sprintf(" <info>%s</info>%s%s%s", $argument->getName(), str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces |
89 | - preg_replace('/\s*\R\s*/', PHP_EOL . str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options); |
|
89 | + preg_replace('/\s*\R\s*/', PHP_EOL.str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | |
109 | 109 | $value = ''; |
110 | 110 | if ($option->acceptValue()) { |
111 | - $value = '=' . strtoupper($option->getName()); |
|
111 | + $value = '='.strtoupper($option->getName()); |
|
112 | 112 | |
113 | 113 | if ($option->isValueOptional()) { |
114 | - $value = '[' . $value . ']'; |
|
114 | + $value = '['.$value.']'; |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $spacingWidth = $totalWidth - strlen($synopsis) + 2; |
122 | 122 | |
123 | 123 | $this->writeText(sprintf(" <info>%s</info>%s%s%s%s", $synopsis, str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces |
124 | - preg_replace('/\s*\R\s*/', "\n" . str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options); |
|
124 | + preg_replace('/\s*\R\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $this->writeText('<comment>Usage:</comment>', $options); |
185 | 185 | foreach (array_merge([$command->getSynopsis(true)], $command->getAliases(), $command->getUsages()) as $usage) { |
186 | 186 | $this->writeText("\n"); |
187 | - $this->writeText(' ' . $usage, $options); |
|
187 | + $this->writeText(' '.$usage, $options); |
|
188 | 188 | } |
189 | 189 | $this->writeText("\n"); |
190 | 190 | |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | $this->writeText("\n"); |
200 | 200 | $this->writeText('<comment>Help:</comment>', $options); |
201 | 201 | $this->writeText("\n"); |
202 | - $this->writeText(' ' . str_replace("\n", "\n ", $help), $options); |
|
202 | + $this->writeText(' '.str_replace("\n", "\n ", $help), $options); |
|
203 | 203 | $this->writeText("\n"); |
204 | 204 | } |
205 | 205 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | foreach ($description->getNamespaces() as $namespace) { |
248 | 248 | if (!$describedNamespace && ConsoleDescription::GLOBAL_NAMESPACE !== $namespace['id']) { |
249 | 249 | $this->writeText("\n"); |
250 | - $this->writeText(' <comment>' . $namespace['id'] . '</comment>', $options); |
|
250 | + $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | foreach ($namespace['commands'] as $name) { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | $that = $this; |
52 | 52 | |
53 | - $interviewer = function () use ($that) { |
|
53 | + $interviewer = function() use ($that) { |
|
54 | 54 | return $that->doAsk(); |
55 | 55 | }; |
56 | 56 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | protected function getHiddenResponse($inputStream) |
193 | 193 | { |
194 | 194 | if ('\\' === DIRECTORY_SEPARATOR) { |
195 | - $exe = __DIR__ . '/../bin/hiddeninput.exe'; |
|
195 | + $exe = __DIR__.'/../bin/hiddeninput.exe'; |
|
196 | 196 | |
197 | 197 | $value = rtrim(shell_exec($exe)); |
198 | 198 | $this->output->writeln(''); |
@@ -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 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | private $console; |
29 | 29 | private $name; |
30 | 30 | private $processTitle; |
31 | - private $aliases = []; |
|
31 | + private $aliases = []; |
|
32 | 32 | private $definition; |
33 | 33 | private $help; |
34 | 34 | private $description; |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | ]; |
405 | 405 | $replacements = [ |
406 | 406 | $name, |
407 | - $_SERVER['PHP_SELF'] . ' ' . $name, |
|
407 | + $_SERVER['PHP_SELF'].' '.$name, |
|
408 | 408 | ]; |
409 | 409 | |
410 | 410 | return str_replace($placeholders, $replacements, $this->getHelp()); |
@@ -356,11 +356,11 @@ |
||
356 | 356 | } |
357 | 357 | |
358 | 358 | foreach ($this->getArguments() as $argument) { |
359 | - $element = '<' . $argument->getName() . '>'; |
|
359 | + $element = '<'.$argument->getName().'>'; |
|
360 | 360 | if (!$argument->isRequired()) { |
361 | - $element = '[' . $element . ']'; |
|
361 | + $element = '['.$element.']'; |
|
362 | 362 | } elseif ($argument->isArray()) { |
363 | - $element .= ' (' . $element . ')'; |
|
363 | + $element .= ' ('.$element.')'; |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | if ($argument->isArray()) { |
@@ -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 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | public function __construct($driver = 'console') |
70 | 70 | { |
71 | - $class = '\\think\\console\\output\\driver\\' . ucwords($driver); |
|
71 | + $class = '\\think\\console\\output\\driver\\'.ucwords($driver); |
|
72 | 72 | |
73 | 73 | $this->handle = new $class($this); |
74 | 74 | } |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | if ($this->handle && method_exists($this->handle, $method)) { |
218 | 218 | return call_user_func_array([$this->handle, $method], $args); |
219 | 219 | } else { |
220 | - throw new Exception('method not exists:' . __CLASS__ . '->' . $method); |
|
220 | + throw new Exception('method not exists:'.__CLASS__.'->'.$method); |
|
221 | 221 | } |
222 | 222 | } |
223 | 223 |
@@ -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 | |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | $array[] = str_repeat($style[1], $width + 2); |
197 | 197 | } |
198 | 198 | |
199 | - return $style[0] . implode($style[2], $array) . $style[3] . PHP_EOL; |
|
199 | + return $style[0].implode($style[2], $array).$style[3].PHP_EOL; |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | /** |
@@ -210,11 +210,11 @@ discard block |
||
210 | 210 | $content = $this->renderSeparator('top'); |
211 | 211 | |
212 | 212 | foreach ($this->header as $key => $header) { |
213 | - $array[] = ' ' . str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign); |
|
213 | + $array[] = ' '.str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | if (!empty($array)) { |
217 | - $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL; |
|
217 | + $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL; |
|
218 | 218 | |
219 | 219 | if (!empty($this->rows)) { |
220 | 220 | $content .= $this->renderSeparator('middle'); |
@@ -257,20 +257,20 @@ discard block |
||
257 | 257 | $content .= $this->renderSeparator('middle'); |
258 | 258 | } elseif (is_scalar($row)) { |
259 | 259 | $content .= $this->renderSeparator('cross-top'); |
260 | - $array = str_pad($row, 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function ($a, $b) { |
|
260 | + $array = str_pad($row, 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function($a, $b) { |
|
261 | 261 | return $a + $b; |
262 | 262 | })); |
263 | 263 | |
264 | - $content .= $style[0] . ' ' . $array . ' ' . $style[3] . PHP_EOL; |
|
264 | + $content .= $style[0].' '.$array.' '.$style[3].PHP_EOL; |
|
265 | 265 | $content .= $this->renderSeparator('cross-bottom'); |
266 | 266 | } else { |
267 | 267 | $array = []; |
268 | 268 | |
269 | 269 | foreach ($row as $key => $val) { |
270 | - $array[] = ' ' . str_pad((string) $val, $this->colWidth[$key], ' ', $this->cellAlign); |
|
270 | + $array[] = ' '.str_pad((string) $val, $this->colWidth[$key], ' ', $this->cellAlign); |
|
271 | 271 | } |
272 | 272 | |
273 | - $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL; |
|
273 | + $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL; |
|
274 | 274 | |
275 | 275 | } |
276 | 276 | } |
@@ -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 | |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | |
268 | 268 | foreach ($this->tokens as $token) { |
269 | 269 | foreach ($values as $value) { |
270 | - if ($token === $value || 0 === strpos($token, $value . '=')) { |
|
270 | + if ($token === $value || 0 === strpos($token, $value.'=')) { |
|
271 | 271 | return true; |
272 | 272 | } |
273 | 273 | } |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | $token = array_shift($tokens); |
292 | 292 | |
293 | 293 | foreach ($values as $value) { |
294 | - if ($token === $value || 0 === strpos($token, $value . '=')) { |
|
294 | + if ($token === $value || 0 === strpos($token, $value.'=')) { |
|
295 | 295 | if (false !== $pos = strpos($token, '=')) { |
296 | 296 | return substr($token, $pos + 1); |
297 | 297 | } |
@@ -448,9 +448,9 @@ discard block |
||
448 | 448 | */ |
449 | 449 | public function __toString() |
450 | 450 | { |
451 | - $tokens = array_map(function ($token) { |
|
451 | + $tokens = array_map(function($token) { |
|
452 | 452 | if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) { |
453 | - return $match[1] . $this->escapeToken($match[2]); |
|
453 | + return $match[1].$this->escapeToken($match[2]); |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | if ($token && '-' !== $token[0]) { |
@@ -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\console\command; |
14 | 14 | |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | protected function execute(Input $input, Output $output) |
29 | 29 | { |
30 | - $output->writeln('v' . $this->app->version()); |
|
30 | + $output->writeln('v'.$this->app->version()); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $pathname = $this->getPathName($classname); |
37 | 37 | |
38 | 38 | if (is_file($pathname)) { |
39 | - $output->writeln('<error>' . $this->type . ':' . $classname . ' already exists!</error>'); |
|
39 | + $output->writeln('<error>'.$this->type.':'.$classname.' already exists!</error>'); |
|
40 | 40 | return false; |
41 | 41 | } |
42 | 42 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | file_put_contents($pathname, $this->buildClass($classname)); |
48 | 48 | |
49 | - $output->writeln('<info>' . $this->type . ':' . $classname . ' created successfully.</info>'); |
|
49 | + $output->writeln('<info>'.$this->type.':'.$classname.' created successfully.</info>'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | protected function buildClass(string $name) |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $namespace = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\'); |
57 | 57 | |
58 | - $class = str_replace($namespace . '\\', '', $name); |
|
58 | + $class = str_replace($namespace.'\\', '', $name); |
|
59 | 59 | |
60 | 60 | return str_replace(['{%className%}', '{%actionSuffix%}', '{%namespace%}', '{%app_namespace%}'], [ |
61 | 61 | $class, |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | { |
70 | 70 | $name = str_replace('app\\', '', $name); |
71 | 71 | |
72 | - return $this->app->getBasePath() . ltrim(str_replace('\\', '/', $name), '/') . '.php'; |
|
72 | + return $this->app->getBasePath().ltrim(str_replace('\\', '/', $name), '/').'.php'; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | protected function getClassName(string $name): string |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | $name = str_replace('/', '\\', $name); |
89 | 89 | } |
90 | 90 | |
91 | - return $this->getNamespace($app) . '\\' . $name; |
|
91 | + return $this->getNamespace($app).'\\'.$name; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | protected function getNamespace(string $app): string |
95 | 95 | { |
96 | - return 'app' . ($app ? '\\' . $app : ''); |
|
96 | + return 'app'.($app ? '\\'.$app : ''); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | } |