top-think / framework

tests/HttpTest.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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();
             }
@@ -77,8 +77,8 @@ 
             ],
         ]);
 
-        $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();

src/think/Http.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -52,7 +52,7 @@ 
     {
         $this->app = $app;
 
-        $this->routePath = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+        $this->routePath = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -199,14 +199,14 @@ 
 
         return $this->app->middleware->pipeline()
             ->send($request)
-            ->then(function ($request) {
+            ->then(function($request) {
                 return $this->dispatchToRoute($request);
             });
     }
 
     protected function dispatchToRoute($request)
     {
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -218,8 +218,8 @@ 
      */
     protected function loadMiddleware(): void
     {
-        if (is_file($this->app->getBasePath() . 'middleware.php')) {
-            $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
+        if (is_file($this->app->getBasePath().'middleware.php')) {
+            $this->app->middleware->import(include $this->app->getBasePath().'middleware.php');
         }
     }
 
@@ -234,7 +234,7 @@ 
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
+            $files = glob($routePath.'*.php');
             foreach ($files as $file) {
                 include $file;
             }

src/think/console/Command.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -404,7 +404,7 @@ 
         ];
         $replacements = [
             $name,
-            $_SERVER['PHP_SELF'] . ' ' . $name,
+            $_SERVER['PHP_SELF'].' '.$name,
         ];
 
         return str_replace($placeholders, $replacements, $this->getHelp());

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

Spacing +13 added lines, -13 removed lines

@@ -48,21 +48,21 @@ 
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
             if ($dir) {
-                $appPath   = $this->app->getBasePath() . $dir . DIRECTORY_SEPARATOR;
-                $namespace = 'app\\' . $dir;
+                $appPath   = $this->app->getBasePath().$dir.DIRECTORY_SEPARATOR;
+                $namespace = 'app\\'.$dir;
             } else {
                 $appPath   = $this->app->getBasePath();
                 $namespace = 'app';
             }
 
-            $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($class);
             }
 
@@ -70,7 +70,7 @@ 
             return;
         }
 
-        $db = isset($dbName) ? $dbName . '.' : '';
+        $db = isset($dbName) ? $dbName.'.' : '';
         $this->buildDataBaseSchema($schemaPath, $tables, $db);
 
         $output->writeln('<info>Succeed!</info>');
@@ -89,27 +89,27 @@ 
             if (!is_dir($path)) {
                 mkdir($path, 0755, true);
             }
-            $content = '<?php ' . PHP_EOL . 'return ';
+            $content = '<?php '.PHP_EOL.'return ';
             $info    = $model->db()->getConnection()->getTableFieldsInfo($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->getConnection()->getConfig('database') . '.';
+            $dbName = $this->app->db->getConnection()->getConfig('database').'.';
         } else {
             $dbName = $db;
         }
 
         foreach ($tables as $table) {
-            $content = '<?php ' . PHP_EOL . 'return ';
-            $info    = $this->app->db->getConnection()->getTableFieldsInfo($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()->getTableFieldsInfo($db.$table);
+            $content .= var_export($info, true).';';
+            file_put_contents($path.$dbName.$table.'.php', $content);
         }
     }
 }

src/think/console/command/RouteList.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     {
         $dir = $input->getArgument('dir') ?: '';
 
-        $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '') . 'route_list.php';
+        $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '').'route_list.php';
 
         if (is_file($filename)) {
             unlink($filename);
@@ -51,7 +51,7 @@ 
         }
 
         $content = $this->getRouteList($dir);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $dir = null): string
@@ -60,16 +60,16 @@ 
         $this->app->route->clear();
 
         if ($dir) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
         } else {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
         }
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
@@ -108,7 +108,7 @@ 
                 $sort = $this->sortBy[$sort];
             }
 
-            uasort($rows, function ($a, $b) use ($sort) {
+            uasort($rows, function($a, $b) use ($sort) {
                 $itemA = $a[$sort] ?? null;
                 $itemB = $b[$sort] ?? null;
 

tests/MiddlewareTest.php

Spacing +6 added lines, -6 removed lines

@@ -64,9 +64,9 @@ 
 
         $this->middleware->add('foo');
         $this->assertEquals(3, count($this->middleware->all()));
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
         $this->assertEquals(5, count($this->middleware->all()));
     }
@@ -85,10 +85,10 @@ 
         $handle->shouldReceive('report')->with($e)->andReturnNull();
         $handle->shouldReceive('render')->with($request, $e)->andReturn($response);
 
-        $foo->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) {
+        $foo->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) {
             return $next($request);
         });
-        $bar->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) use ($e) {
+        $bar->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) use ($e) {
             $next($request);
             throw  $e;
         });
@@ -99,13 +99,13 @@ 
 
         $this->config->shouldReceive('get')->once()->with('middleware.priority', [])->andReturn(['FooMiddleware', 'BarMiddleware']);
 
-        $this->middleware->import([function ($request, $next) {
+        $this->middleware->import([function($request, $next) {
             return $next($request);
         }, 'BarMiddleware', 'FooMiddleware']);
 
         $this->assertInstanceOf(Pipeline::class, $pipeline = $this->middleware->pipeline());
 
-        $pipeline->send($request)->then(function ($request) use ($e, $response) {
+        $pipeline->send($request)->then(function($request) use ($e, $response) {
             throw $e;
         });
 

src/think/session/driver/File.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\session\driver;
 
@@ -39,7 +39,7 @@ 
         $this->config = array_merge($this->config, $config);
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'session' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'session'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -76,7 +76,7 @@ 
         $lifetime = $this->config['expire'];
         $now      = time();
 
-        $files = $this->findFiles($this->config['path'], function (SplFileInfo $item) use ($lifetime, $now) {
+        $files = $this->findFiles($this->config['path'], function(SplFileInfo $item) use ($lifetime, $now) {
             return $now - $lifetime > $item->getMTime();
         });
 
@@ -118,12 +118,12 @@ 
     {
         if ($this->config['prefix']) {
             // 使用子目录
-            $name = $this->config['prefix'] . DIRECTORY_SEPARATOR . 'sess_' . $name;
+            $name = $this->config['prefix'].DIRECTORY_SEPARATOR.'sess_'.$name;
         } else {
-            $name = 'sess_' . $name;
+            $name = 'sess_'.$name;
         }
 
-        $filename = $this->config['path'] . $name;
+        $filename = $this->config['path'].$name;
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {

src/think/Route.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -160,9 +160,9 @@ 
         $this->ruleName = new RuleName();
         $this->setDefaultDomain();
 
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
+        if (is_file($this->app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
+            $this->import(include $this->app->getRuntimePath().'route.php');
         }
     }
 
@@ -392,14 +392,14 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } elseif (false === strpos($domain, '.') && $this->request) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         if ($this->request) {
             $subDomain = $this->request->subDomain();
 
             if (strpos($subDomain, '.')) {
-                $name = '*' . strstr($subDomain, '.');
+                $name = '*'.strstr($subDomain, '.');
             }
         }
 
@@ -743,7 +743,7 @@ 
 
         return $this->app->middleware->pipeline('route')
             ->send($request)
-            ->then(function () use ($dispatch) {
+            ->then(function() use ($dispatch) {
                 return $dispatch->run();
             });
     }
@@ -792,10 +792,10 @@ 
             $path = $pathinfo;
         } elseif ($suffix) {
             // 去除正常的URL后缀
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
         } else {
             // 允许任何后缀访问
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
         }
 
         return $path;
@@ -838,9 +838,9 @@ 
                 $item = $this->domains[$this->host];
             } elseif (isset($this->domains[$subDomain])) {
                 $item = $this->domains[$subDomain];
-            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
+            } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) {
                 // 泛三级域名
-                $item      = $this->domains['*.' . $domain2];
+                $item      = $this->domains['*.'.$domain2];
                 $panDomain = $domain3;
             } elseif (isset($this->domains['*']) && !empty($domain2)) {
                 // 泛二级域名

src/think/console/command/Clear.php

Spacing +9 added lines, -9 removed lines

@@ -30,18 +30,18 @@ 
 
     protected function execute(Input $input, Output $output)
     {
-        $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR;
+        $runtimePath = $this->app->getRootPath().'runtime'.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>");
     }
@@ -51,13 +51,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);
             }
         }
     }