top-think / framework

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);
             }
         }
     }

src/think/console/command/make/Validate.php

Spacing +3 added lines, -3 removed lines

@@ -26,14 +26,14 @@
 
     protected function getStub(): string
     {
-        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
+        $stubPath = __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR;
 
-        return $stubPath . 'validate.stub';
+        return $stubPath.'validate.stub';
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\validate';
+        return parent::getNamespace($app).'\\validate';
     }
 
 }

src/think/console/command/make/Command.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
         $commandName = $this->input->getArgument('commandName') ?: strtolower(basename($name));
         $namespace   = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
 
-        $class = str_replace($namespace . '\\', '', $name);
+        $class = str_replace($namespace.'\\', '', $name);
         $stub  = file_get_contents($this->getStub());
 
         return str_replace(['{%commandName%}', '{%className%}', '{%namespace%}', '{%app_namespace%}'], [
@@ -44,12 +44,12 @@ 
 
     protected function getStub(): string
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'command.stub';
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'command.stub';
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\command';
+        return parent::getNamespace($app).'\\command';
     }
 
 }

src/think/console/command/make/Listener.php

Spacing +2 added lines, -2 removed lines

@@ -25,11 +25,11 @@
 
     protected function getStub(): string
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'listener.stub';
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'listener.stub';
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\listener';
+        return parent::getNamespace($app).'\\listener';
     }
 }

src/think/console/command/make/Model.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
 
     protected function getStub(): string
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'model.stub';
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'model.stub';
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\model';
+        return parent::getNamespace($app).'\\model';
     }
 }

src/think/console/command/make/Service.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
 
     protected function getStub(): string
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'service.stub';
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'service.stub';
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\service';
+        return parent::getNamespace($app).'\\service';
     }
 }

src/think/console/command/make/Middleware.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     protected function getStub(): string
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'middleware.stub';
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'middleware.stub';
     }
 
     protected function getNamespace(string $app): string