top-think / framework

src/think/console/output/driver/Console.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,7 @@ 
             proc_close($process);
 
             if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return $matches[2] . 'x' . $matches[1];
+                return $matches[2].'x'.$matches[1];
             }
         }
         return;
@@ -264,7 +264,7 @@ 
         $lines      = [];
         $line       = '';
         foreach (preg_split('//u', $utf8String) as $char) {
-            if (mb_strwidth($line . $char, 'utf8') <= $width) {
+            if (mb_strwidth($line.$char, 'utf8') <= $width) {
                 $line .= $char;
                 continue;
             }
@@ -340,7 +340,7 @@ 
         if (null === $stream) {
             $stream = $this->stdout;
         }
-        if (false === @fwrite($stream, $message . ($newline ? PHP_EOL : ''))) {
+        if (false === @fwrite($stream, $message.($newline ? PHP_EOL : ''))) {
             throw new \RuntimeException('Unable to write output.');
         }
 
@@ -356,7 +356,7 @@ 
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             return
-            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
+            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
             || false !== getenv('ANSICON')
             || 'ON' === getenv('ConEmuANSI')
             || 'xterm' === getenv('TERM');

src/think/console/output/Descriptor.php

Spacing +7 added lines, -7 removed lines

@@ -86,7 +86,7 @@ 
         $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s", $argument->getName(), str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', PHP_EOL . str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
+            preg_replace('/\s*\R\s*/', PHP_EOL.str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
     }
 
     /**
@@ -108,10 +108,10 @@ 
 
         $value = '';
         if ($option->acceptValue()) {
-            $value = '=' . strtoupper($option->getName());
+            $value = '='.strtoupper($option->getName());
 
             if ($option->isValueOptional()) {
-                $value = '[' . $value . ']';
+                $value = '['.$value.']';
             }
         }
 
@@ -121,7 +121,7 @@ 
         $spacingWidth = $totalWidth - strlen($synopsis) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s%s", $synopsis, str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', "\n" . str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
+            preg_replace('/\s*\R\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
     }
 
     /**
@@ -184,7 +184,7 @@ 
         $this->writeText('<comment>Usage:</comment>', $options);
         foreach (array_merge([$command->getSynopsis(true)], $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
-            $this->writeText('  ' . $usage, $options);
+            $this->writeText('  '.$usage, $options);
         }
         $this->writeText("\n");
 
@@ -199,7 +199,7 @@ 
             $this->writeText("\n");
             $this->writeText('<comment>Help:</comment>', $options);
             $this->writeText("\n");
-            $this->writeText(' ' . str_replace("\n", "\n ", $help), $options);
+            $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
             $this->writeText("\n");
         }
     }
@@ -247,7 +247,7 @@ 
             foreach ($description->getNamespaces() as $namespace) {
                 if (!$describedNamespace && ConsoleDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
                     $this->writeText("\n");
-                    $this->writeText(' <comment>' . $namespace['id'] . '</comment>', $options);
+                    $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options);
                 }
 
                 foreach ($namespace['commands'] as $name) {

src/think/console/output/Ask.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 
         $that = $this;
 
-        $interviewer = function () use ($that) {
+        $interviewer = function() use ($that) {
             return $that->doAsk();
         };
 
@@ -192,7 +192,7 @@ 
     protected function getHiddenResponse($inputStream)
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
-            $exe = __DIR__ . '/../bin/hiddeninput.exe';
+            $exe = __DIR__.'/../bin/hiddeninput.exe';
 
             $value = rtrim(shell_exec($exe));
             $this->output->writeln('');

src/think/console/input/Definition.php

Spacing +3 added lines, -3 removed lines

@@ -356,11 +356,11 @@
         }
 
         foreach ($this->getArguments() as $argument) {
-            $element = '<' . $argument->getName() . '>';
+            $element = '<'.$argument->getName().'>';
             if (!$argument->isRequired()) {
-                $element = '[' . $element . ']';
+                $element = '['.$element.']';
             } elseif ($argument->isArray()) {
-                $element .= ' (' . $element . ')';
+                $element .= ' ('.$element.')';
             }
 
             if ($argument->isArray()) {

src/think/console/Output.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -68,7 +68,7 @@ 
 
     public function __construct($driver = 'console')
     {
-        $class = '\\think\\console\\output\\driver\\' . ucwords($driver);
+        $class = '\\think\\console\\output\\driver\\'.ucwords($driver);
 
         $this->handle = new $class($this);
     }
@@ -217,7 +217,7 @@ 
         if ($this->handle && method_exists($this->handle, $method)) {
             return call_user_func_array([$this->handle, $method], $args);
         } else {
-            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+            throw new Exception('method not exists:'.__CLASS__.'->'.$method);
         }
     }
 

src/think/console/Input.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -267,7 +267,7 @@ 
 
         foreach ($this->tokens as $token) {
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                if ($token === $value || 0 === strpos($token, $value.'=')) {
                     return true;
                 }
             }
@@ -291,7 +291,7 @@ 
             $token = array_shift($tokens);
 
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                if ($token === $value || 0 === strpos($token, $value.'=')) {
                     if (false !== $pos = strpos($token, '=')) {
                         return substr($token, $pos + 1);
                     }
@@ -448,9 +448,9 @@ 
      */
     public function __toString()
     {
-        $tokens = array_map(function ($token) {
+        $tokens = array_map(function($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1] . $this->escapeToken($match[2]);
+                return $match[1].$this->escapeToken($match[2]);
             }
 
             if ($token && '-' !== $token[0]) {

src/think/console/command/Version.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console\command;
 
@@ -27,7 +27,7 @@ 
 
     protected function execute(Input $input, Output $output)
     {
-        $output->writeln('v' . $this->app->version());
+        $output->writeln('v'.$this->app->version());
     }
 
 }

src/think/console/command/Make.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
         $pathname = $this->getPathName($classname);
 
         if (is_file($pathname)) {
-            $output->writeln('<error>' . $this->type . ':' . $classname . ' already exists!</error>');
+            $output->writeln('<error>'.$this->type.':'.$classname.' already exists!</error>');
             return false;
         }
 
@@ -46,7 +46,7 @@ 
 
         file_put_contents($pathname, $this->buildClass($classname));
 
-        $output->writeln('<info>' . $this->type . ':' . $classname . ' created successfully.</info>');
+        $output->writeln('<info>'.$this->type.':'.$classname.' created successfully.</info>');
     }
 
     protected function buildClass(string $name)
@@ -55,7 +55,7 @@ 
 
         $namespace = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
 
-        $class = str_replace($namespace . '\\', '', $name);
+        $class = str_replace($namespace.'\\', '', $name);
 
         return str_replace(['{%className%}', '{%actionSuffix%}', '{%namespace%}', '{%app_namespace%}'], [
             $class,
@@ -69,7 +69,7 @@ 
     {
         $name = str_replace('app\\', '', $name);
 
-        return $this->app->getBasePath() . ltrim(str_replace('\\', '/', $name), '/') . '.php';
+        return $this->app->getBasePath().ltrim(str_replace('\\', '/', $name), '/').'.php';
     }
 
     protected function getClassName(string $name): string
@@ -88,12 +88,12 @@ 
             $name = str_replace('/', '\\', $name);
         }
 
-        return $this->getNamespace($app) . '\\' . $name;
+        return $this->getNamespace($app).'\\'.$name;
     }
 
     protected function getNamespace(string $app): string
     {
-        return 'app' . ($app ? '\\' . $app : '');
+        return 'app'.($app ? '\\'.$app : '');
     }
 
 }

src/think/console/command/Build.php

Spacing +24 added lines, -24 removed lines

@@ -40,12 +40,12 @@ 
         $this->basePath = $this->app->getBasePath();
         $app            = $input->getArgument('app') ?: '';
 
-        if (empty($app) && !is_dir($this->basePath . 'controller')) {
+        if (empty($app) && !is_dir($this->basePath.'controller')) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }
 
-        $list = include $this->basePath . 'build.php';
+        $list = include $this->basePath.'build.php';
 
         if (empty($list)) {
             $output->writeln("Build file Is Empty");
@@ -66,13 +66,13 @@ 
      */
     protected function buildApp(string $app, array $list = []): void
     {
-        if (!is_dir($this->basePath . $app)) {
+        if (!is_dir($this->basePath.$app)) {
             // 创建应用目录
-            mkdir($this->basePath . $app);
+            mkdir($this->basePath.$app);
         }
 
-        $appPath   = $this->basePath . ($app ? $app . DIRECTORY_SEPARATOR : '');
-        $namespace = 'app' . ($app ? '\\' . $app : '');
+        $appPath   = $this->basePath.($app ? $app.DIRECTORY_SEPARATOR : '');
+        $namespace = 'app'.($app ? '\\'.$app : '');
 
         // 创建配置文件和公共文件
         $this->buildCommon($app);
@@ -83,41 +83,41 @@ 
             if ('__dir__' == $path) {
                 // 生成子目录
                 foreach ($file as $dir) {
-                    $this->checkDirBuild($appPath . $dir);
+                    $this->checkDirBuild($appPath.$dir);
                 }
             } elseif ('__file__' == $path) {
                 // 生成（空白）文件
                 foreach ($file as $name) {
-                    if (!is_file($appPath . $name)) {
-                        file_put_contents($appPath . $name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? '<?php' . PHP_EOL : '');
+                    if (!is_file($appPath.$name)) {
+                        file_put_contents($appPath.$name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? '<?php'.PHP_EOL : '');
                     }
                 }
             } else {
                 // 生成相关MVC文件
                 foreach ($file as $val) {
                     $val      = trim($val);
-                    $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . '.php';
-                    $space    = $namespace . '\\' . $path;
+                    $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'.php';
+                    $space    = $namespace.'\\'.$path;
                     $class    = $val;
                     switch ($path) {
                         case 'controller': // 控制器
                             if ($this->app->config->get('route.controller_suffix')) {
-                                $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . 'Controller.php';
-                                $class    = $val . 'Controller';
+                                $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'Controller.php';
+                                $class    = $val.'Controller';
                             }
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "class {$class}" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."class {$class}".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                             break;
                         case 'model': // 模型
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "use think\Model;" . PHP_EOL . PHP_EOL . "class {$class} extends Model" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."use think\Model;".PHP_EOL.PHP_EOL."class {$class} extends Model".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                             break;
                         case 'view': // 视图
-                            $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . '.html';
+                            $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'.html';
                             $this->checkDirBuild(dirname($filename));
                             $content = '';
                             break;
                         default:
                             // 其他文件
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "class {$class}" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."class {$class}".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                     }
 
                     if (!is_file($filename)) {
@@ -138,10 +138,10 @@ 
     protected function buildHello(string $appName, string $namespace): void
     {
         $suffix   = $this->app->config->get('route.controller_suffix') ? 'Controller' : '';
-        $filename = $this->basePath . ($appName ? $appName . DIRECTORY_SEPARATOR : '') . 'controller' . DIRECTORY_SEPARATOR . 'Index' . $suffix . '.php';
+        $filename = $this->basePath.($appName ? $appName.DIRECTORY_SEPARATOR : '').'controller'.DIRECTORY_SEPARATOR.'Index'.$suffix.'.php';
 
         if (!is_file($filename)) {
-            $content = file_get_contents($this->app->getThinkPath() . 'tpl' . DIRECTORY_SEPARATOR . 'default_index.tpl');
+            $content = file_get_contents($this->app->getThinkPath().'tpl'.DIRECTORY_SEPARATOR.'default_index.tpl');
             $content = str_replace(['{%name%}', '{%app%}', '{%layer%}', '{%suffix%}'], [$appName, $namespace, 'controller', $suffix], $content);
             $this->checkDirBuild(dirname($filename));
 
@@ -157,15 +157,15 @@ 
      */
     protected function buildCommon(string $appName): void
     {
-        $appPath = $this->basePath . ($appName ? $appName . DIRECTORY_SEPARATOR : '');
+        $appPath = $this->basePath.($appName ? $appName.DIRECTORY_SEPARATOR : '');
 
-        if (!is_file($appPath . 'common.php')) {
-            file_put_contents($appPath . 'common.php', "<?php" . PHP_EOL . "// 这是系统自动生成的{$appName}应用公共文件" . PHP_EOL);
+        if (!is_file($appPath.'common.php')) {
+            file_put_contents($appPath.'common.php', "<?php".PHP_EOL."// 这是系统自动生成的{$appName}应用公共文件".PHP_EOL);
         }
 
         foreach (['event', 'middleware', 'provider'] as $name) {
-            if (!is_file($appPath . $name . '.php')) {
-                file_put_contents($appPath . $name . '.php', "<?php" . PHP_EOL . "// 这是系统自动生成的{$appName}应用{$name}定义文件" . PHP_EOL . "return [" . PHP_EOL . PHP_EOL . "];" . PHP_EOL);
+            if (!is_file($appPath.$name.'.php')) {
+                file_put_contents($appPath.$name.'.php', "<?php".PHP_EOL."// 这是系统自动生成的{$appName}应用{$name}定义文件".PHP_EOL."return [".PHP_EOL.PHP_EOL."];".PHP_EOL);
             }
         }
     }