top-think / framework

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +6 added lines, -6 removed lines

@@ -30,27 +30,27 @@
 
     protected function getStub(): string
     {
-        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
+        $stubPath = __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR;
 
         if ($this->input->getOption('api')) {
-            return $stubPath . 'controller.api.stub';
+            return $stubPath.'controller.api.stub';
         }
 
         if ($this->input->getOption('plain')) {
-            return $stubPath . 'controller.plain.stub';
+            return $stubPath.'controller.plain.stub';
         }
 
-        return $stubPath . 'controller.stub';
+        return $stubPath.'controller.stub';
     }
 
     protected function getClassName(string $name): string
     {
-        return parent::getClassName($name) . ($this->app->config->get('route.controller_suffix') ? 'Controller' : '');
+        return parent::getClassName($name).($this->app->config->get('route.controller_suffix') ? 'Controller' : '');
     }
 
     protected function getNamespace(string $app): string
     {
-        return parent::getNamespace($app) . '\\controller';
+        return parent::getNamespace($app).'\\controller';
     }
 
 }

src/think/console/command/Clear.php

Spacing +9 added lines, -9 removed lines

@@ -38,18 +38,18 @@ 
             $this->app->cache->clear('route_cache');
         } else {
             $app         = $input->getArgument('app');
-            $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+            $runtimePath = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
             if ($input->getOption('cache')) {
-                $path = $runtimePath . 'cache';
+                $path = $runtimePath.'cache';
             } elseif ($input->getOption('log')) {
-                $path = $runtimePath . 'log';
+                $path = $runtimePath.'log';
             } else {
                 $path = $input->getOption('path') ?: $runtimePath;
             }
 
             $rmdir = $input->getOption('dir') ? true : false;
-            $this->clear(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $rmdir);
+            $this->clear(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, $rmdir);
         }
 
         $output->writeln("<info>Clear Successed</info>");
@@ -60,13 +60,13 @@ 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
-            if ('.' != $file && '..' != $file && is_dir($path . $file)) {
-                array_map('unlink', glob($path . $file . DIRECTORY_SEPARATOR . '*.*'));
+            if ('.' != $file && '..' != $file && is_dir($path.$file)) {
+                array_map('unlink', glob($path.$file.DIRECTORY_SEPARATOR.'*.*'));
                 if ($rmdir) {
-                    rmdir($path . $file);
+                    rmdir($path.$file);
                 }
-            } elseif ('.gitignore' != $file && is_file($path . $file)) {
-                unlink($path . $file);
+            } elseif ('.gitignore' != $file && is_file($path.$file)) {
+                unlink($path.$file);
             }
         }
     }

src/think/console/command/RunServer.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: Slince <taosikai@yeah.net>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console\command;
 
@@ -37,7 +37,7 @@ 
         $port = $input->getOption('port');
         $root = $input->getOption('root');
         if (empty($root)) {
-            $root = $this->app->getRootPath() . 'public';
+            $root = $this->app->getRootPath().'public';
         }
 
         $command = sprintf(
@@ -45,7 +45,7 @@ 
             $host,
             $port,
             escapeshellarg($root),
-            escapeshellarg($root . DIRECTORY_SEPARATOR . 'router.php')
+            escapeshellarg($root.DIRECTORY_SEPARATOR.'router.php')
         );
 
         $output->writeln(sprintf('ThinkPHP Development server is started On <http://%s:%s/>', '0.0.0.0' == $host ? '127.0.0.1' : $host, $port));

src/think/console/command/ServiceDiscover.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\command;
 
@@ -26,7 +26,7 @@ 
 
     public function execute(Input $input, Output $output)
     {
-        if (is_file($path = $this->app->getRootPath() . 'vendor/composer/installed.json')) {
+        if (is_file($path = $this->app->getRootPath().'vendor/composer/installed.json')) {
             $packages = json_decode(@file_get_contents($path), true);
 
             $services = [];
@@ -36,15 +36,15 @@ 
                 }
             }
 
-            $header = '// This cache file is automatically generated at:' . date('Y-m-d H:i:s') . PHP_EOL . 'declare (strict_types = 1);' . PHP_EOL;
+            $header = '// This cache file is automatically generated at:'.date('Y-m-d H:i:s').PHP_EOL.'declare (strict_types = 1);'.PHP_EOL;
 
-            $content = '<?php ' . PHP_EOL . $header . "return " . var_export($services, true) . ';';
+            $content = '<?php '.PHP_EOL.$header."return ".var_export($services, true).';';
 
             if (!is_dir($runtimePath = $this->app->getRuntimePath())) {
                 mkdir($runtimePath, 0755, true);
             }
 
-            file_put_contents($runtimePath . 'services.php', $content);
+            file_put_contents($runtimePath.'services.php', $content);
 
             $output->writeln('<info>Succeed!</info>');
         }

src/think/console/command/optimize/Schema.php

Spacing +17 added lines, -17 removed lines

@@ -31,22 +31,22 @@ 
     {
         $app = $input->getArgument('app');
 
-        if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+        if (empty($app) && !is_dir($this->app->getBasePath().'controller')) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }
 
         if ($app) {
-            $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR;
-            $appPath     = $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR;
-            $namespace   = 'app\\' . $app;
+            $runtimePath = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR;
+            $appPath     = $this->app->getBasePath().$app.DIRECTORY_SEPARATOR;
+            $namespace   = 'app\\'.$app;
         } else {
-            $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR;
+            $runtimePath = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR;
             $appPath     = $this->app->getBasePath();
             $namespace   = 'app';
         }
 
-        $schemaPath = $runtimePath . 'schema' . DIRECTORY_SEPARATOR;
+        $schemaPath = $runtimePath.'schema'.DIRECTORY_SEPARATOR;
         if (!is_dir($schemaPath)) {
             mkdir($schemaPath, 0755, true);
         }
@@ -63,14 +63,14 @@ 
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
 
-            $path = $appPath . 'model';
+            $path = $appPath.'model';
             $list = is_dir($path) ? scandir($path) : [];
 
             foreach ($list as $file) {
                 if (0 === strpos($file, '.')) {
                     continue;
                 }
-                $class = '\\' . $namespace . '\\model\\' . pathinfo($file, PATHINFO_FILENAME);
+                $class = '\\'.$namespace.'\\model\\'.pathinfo($file, PATHINFO_FILENAME);
                 $this->buildModelSchema($schemaPath, $class);
             }
 
@@ -78,7 +78,7 @@ 
             return;
         }
 
-        $db = isset($dbName) ? $dbName . '.' : '';
+        $db = isset($dbName) ? $dbName.'.' : '';
         $this->buildDataBaseSchema($schemaPath, $tables, $db);
 
         $output->writeln('<info>Succeed!</info>');
@@ -94,27 +94,27 @@ 
 
             $table   = $model->getTable();
             $dbName  = $model->getConfig('database');
-            $content = '<?php ' . PHP_EOL . 'return ';
+            $content = '<?php '.PHP_EOL.'return ';
             $info    = $model->db()->getConnection()->getFields($table);
-            $content .= var_export($info, true) . ';';
+            $content .= var_export($info, true).';';
 
-            file_put_contents($path . $dbName . '.' . $table . '.php', $content);
+            file_put_contents($path.$dbName.'.'.$table.'.php', $content);
         }
     }
 
     protected function buildDataBaseSchema(string $path, array $tables, string $db): void
     {
         if ('' == $db) {
-            $dbName = $this->app->db->getConfig('database') . '.';
+            $dbName = $this->app->db->getConfig('database').'.';
         } else {
             $dbName = $db;
         }
 
         foreach ($tables as $table) {
-            $content = '<?php ' . PHP_EOL . 'return ';
-            $info    = $this->app->db->getConnection()->getFields($db . $table);
-            $content .= var_export($info, true) . ';';
-            file_put_contents($path . $dbName . $table . '.php', $content);
+            $content = '<?php '.PHP_EOL.'return ';
+            $info    = $this->app->db->getConnection()->getFields($db.$table);
+            $content .= var_export($info, true).';';
+            file_put_contents($path.$dbName.$table.'.php', $content);
         }
     }
 }

src/think/console/command/VendorPublish.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\command;
 
@@ -29,7 +29,7 @@ 
 
         $force = $this->input->getOption('force');
 
-        if (is_file($path = $this->app->getRootPath() . 'vendor/composer/installed.json')) {
+        if (is_file($path = $this->app->getRootPath().'vendor/composer/installed.json')) {
             $packages = json_decode(@file_get_contents($path), true);
 
             foreach ($packages as $package) {
@@ -38,12 +38,12 @@ 
 
                 if (!empty($package['extra']['think']['config'])) {
 
-                    $installPath = $this->app->getRootPath() . 'vendor/' . $package['name'] . DIRECTORY_SEPARATOR;
+                    $installPath = $this->app->getRootPath().'vendor/'.$package['name'].DIRECTORY_SEPARATOR;
 
                     foreach ((array) $package['extra']['think']['config'] as $name => $file) {
 
-                        $target = $configDir . $name . '.php';
-                        $source = $installPath . $file;
+                        $target = $configDir.$name.'.php';
+                        $source = $installPath.$file;
 
                         if (is_file($target) && !$force) {
                             $this->output->info("File {$target} exist!");