top-think / framework

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!");

src/think/Event.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;
 
@@ -214,7 +214,7 @@ 
 
         foreach ($events as $event) {
             $name   = false !== strpos($event, '\\') ? substr(strrchr($event, '\\'), 1) : $event;
-            $method = 'on' . $name;
+            $method = 'on'.$name;
 
             if (method_exists($observer, $method)) {
                 $this->listen($event, [$observer, $method]);

src/helper.php

Spacing +7 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 //------------------------
 // ThinkPHP 助手函数
@@ -221,12 +221,12 @@ 
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
 
         if (PHP_SAPI == 'cli') {
-            $output = PHP_EOL . $output . PHP_EOL;
+            $output = PHP_EOL.$output.PHP_EOL;
         } else {
             if (!extension_loaded('xdebug')) {
                 $output = htmlspecialchars($output, ENT_SUBSTITUTE);
             }
-            $output = '<pre>' . $output . '</pre>';
+            $output = '<pre>'.$output.'</pre>';
         }
 
         echo $output;
@@ -305,8 +305,7 @@ 
         }
 
         return isset($has) ?
-        request()->has($key, $method) :
-        request()->$method($key, $default, $filter);
+        request()->has($key, $method) : request()->$method($key, $default, $filter);
     }
 }
 
@@ -383,7 +382,7 @@ 
     function parse_name(string $name, int $type = 0, bool $ucfirst = true): string
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -488,7 +487,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 
@@ -503,7 +502,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<meta name="csrf-token" content="' . $token . '">';
+        return '<meta name="csrf-token" content="'.$token.'">';
     }
 }
 

tests/DbTest.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function testConnect($config)
     {
-        $mysql = m::mock('overload:' . Mysql::class);
+        $mysql = m::mock('overload:'.Mysql::class);
 
         $db = new Db($config);
     }

tests/AppTest.php

Spacing +11 added lines, -11 removed lines

@@ -107,27 +107,27 @@ 
 
     public function testPath()
     {
-        $rootPath = __DIR__ . DIRECTORY_SEPARATOR;
+        $rootPath = __DIR__.DIRECTORY_SEPARATOR;
 
         $app = new App($rootPath);
 
         $this->assertEquals($rootPath, $app->getRootPath());
 
-        $this->assertEquals(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR, $app->getThinkPath());
+        $this->assertEquals(dirname(__DIR__).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, $app->getThinkPath());
 
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getAppPath());
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getAppPath());
 
-        $appPath = $rootPath . 'app' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
+        $appPath = $rootPath.'app'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
         $app->setAppPath($appPath);
         $this->assertEquals($appPath, $app->getAppPath());
 
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getBasePath());
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getBasePath());
 
-        $this->assertEquals($rootPath . 'config' . DIRECTORY_SEPARATOR, $app->getConfigPath());
+        $this->assertEquals($rootPath.'config'.DIRECTORY_SEPARATOR, $app->getConfigPath());
 
-        $this->assertEquals($rootPath . 'runtime' . DIRECTORY_SEPARATOR, $app->getRuntimePath());
+        $this->assertEquals($rootPath.'runtime'.DIRECTORY_SEPARATOR, $app->getRuntimePath());
 
-        $runtimePath = $rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
+        $runtimePath = $rootPath.'runtime'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
         $app->setRuntimePath($runtimePath);
         $this->assertEquals($runtimePath, $app->getRuntimePath());
     }
@@ -139,7 +139,7 @@ 
      */
     protected function prepareAppForInitialize(vfsStreamDirectory $root, $debug = true)
     {
-        $rootPath = $root->url() . DIRECTORY_SEPARATOR;
+        $rootPath = $root->url().DIRECTORY_SEPARATOR;
 
         $app = new App($rootPath);
 
@@ -148,12 +148,12 @@ 
 
         $app->instance($initializer->mockery_getName(), $initializer);
 
-        (function () use ($initializer) {
+        (function() use ($initializer) {
             $this->initializers = [$initializer->mockery_getName()];
         })->call($app);
 
         $env = m::mock(Env::class);
-        $env->shouldReceive('load')->once()->with($rootPath . '.env');
+        $env->shouldReceive('load')->once()->with($rootPath.'.env');
         $env->shouldReceive('get')->once()->with('config_ext', '.php')->andReturn('.php');
         $env->shouldReceive('get')->once()->with('app_debug')->andReturn($debug);
 

tests/HttpTest.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 
         $route = m::mock(Route::class);
 
-        $route->shouldReceive('dispatch')->withArgs(function ($req, $withRoute) use ($request) {
+        $route->shouldReceive('dispatch')->withArgs(function($req, $withRoute) use ($request) {
             if ($withRoute) {
                 $withRoute();
             }
@@ -80,8 +80,8 @@ 
 
         $this->http->multi(false);
 
-        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getRootPath')->andReturn($root->url() . DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getRootPath')->andReturn($root->url().DIRECTORY_SEPARATOR);
 
         $request  = m::mock(Request::class)->makePartial();
         $response = m::mock(Response::class)->makePartial();
@@ -140,9 +140,9 @@ 
 
         $this->app->shouldReceive('get')->with('config')->andReturn($config);
 
-        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getRootPath')->andReturn($root->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getConfigPath')->andReturn($root->getChild('config')->url() . DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getRootPath')->andReturn($root->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getConfigPath')->andReturn($root->getChild('config')->url().DIRECTORY_SEPARATOR);
 
         $response = m::mock(Response::class)->makePartial();
 
@@ -174,7 +174,7 @@ 
             $this->assertTrue($this->http->isBindDomain());
         }
         if ($path) {
-            $this->assertEquals(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $this->app->getAppPath());
+            $this->assertEquals(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, $this->app->getAppPath());
         }
     }
 

src/think/middleware/FormTokenCheck.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 

src/think/middleware/AllowCrossDomain.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;