top-think / framework

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

Spacing +13 added lines, -13 removed lines

@@ -49,21 +49,21 @@ 
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
             if ($app) {
-                $appPath   = $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR;
-                $namespace = 'app\\' . $app;
+                $appPath   = $this->app->getBasePath().$app.DIRECTORY_SEPARATOR;
+                $namespace = 'app\\'.$app;
             } 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);
             }
 
@@ -71,7 +71,7 @@ 
             return;
         }
 
-        $db = isset($dbName) ? $dbName . '.' : '';
+        $db = isset($dbName) ? $dbName.'.' : '';
         $this->buildDataBaseSchema($schemaPath, $tables, $db);
 
         $output->writeln('<info>Succeed!</info>');
@@ -90,27 +90,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/route/RuleItem.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -134,7 +134,7 @@ 
         $rule = '/' != $rule ? ltrim($rule, '/') : '';
 
         if ($this->parent && $prefix = $this->parent->getFullName()) {
-            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+            $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : '');
         }
 
         if (false !== strpos($rule, ':')) {
@@ -237,7 +237,7 @@ 
 
         if (isset($option['ext'])) {
             // 路由ext参数 优先于系统配置的URL伪静态后缀参数
-            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+            $url = preg_replace('/\.('.$request->ext().')$/i', '', $url);
         }
 
         return $url;
@@ -261,38 +261,38 @@ 
         $pattern = array_merge($this->parent->getPattern(), $this->pattern);
 
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) {
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].($completeMatch ? '$' : '').'/', str_replace('|', $depr, $url))) {
             return false;
         }
 
         $var  = [];
-        $url  = $depr . str_replace('|', $depr, $url);
-        $rule = $depr . str_replace('/', $depr, $this->rule);
+        $url  = $depr.str_replace('|', $depr, $url);
+        $rule = $depr.str_replace('/', $depr, $this->rule);
 
         if ($depr == $rule && $depr != $url) {
             return false;
         }
 
         if (false === strpos($rule, '<')) {
-            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) {
                 return $var;
             }
             return false;
         }
 
-        $slash = preg_quote('/-' . $depr, '/');
+        $slash = preg_quote('/-'.$depr, '/');
 
-        if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) {
+        if ($matchRule = preg_split('/['.$slash.']?<\w+\??>/', $rule, 2)) {
             if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                 return false;
             }
         }
 
-        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+        if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
             $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
 
             try {
-                if (!preg_match('/^' . $regex . '/u', $url, $match)) {
+                if (!preg_match('/^'.$regex.'/u', $url, $match)) {
                     return false;
                 }
             } catch (\Exception $e) {

src/think/Filesystem.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;
 
@@ -56,7 +56,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('filesystem.' . $name, $default);
+            return $this->app->config->get('filesystem.'.$name, $default);
         }
 
         return $this->app->config->get('filesystem');

tests/ViewTest.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         $this->config->shouldReceive("get")->with("view.type", 'php')->andReturn(TestTemplate::class);
 
-        $this->view->filter(function ($content) {
+        $this->view->filter(function($content) {
             return $content;
         });
 

src/think/View.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -86,7 +86,7 @@ 
      */
     public function fetch(string $template = '', array $vars = []): string
     {
-        return $this->getContent(function () use ($vars, $template) {
+        return $this->getContent(function() use ($vars, $template) {
             $this->engine()->fetch($template, array_merge($this->data, $vars));
         });
     }
@@ -100,7 +100,7 @@ 
      */
     public function display(string $content, array $vars = []): string
     {
-        return $this->getContent(function () use ($vars, $content) {
+        return $this->getContent(function() use ($vars, $content) {
             $this->engine()->display($content, array_merge($this->data, $vars));
         });
     }

src/think/view/driver/Php.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\view\driver;
 
@@ -78,14 +78,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new RuntimeException('template not exists:' . $template);
+            throw new RuntimeException('template not exists:'.$template);
         }
 
         $this->template = $template;
 
         // 记录视图信息
         $this->app->log
-            ->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->record('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         extract($data, EXTR_OVERWRITE);
 
@@ -104,7 +104,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -129,10 +129,10 @@ 
             $appName = isset($app) ? $app : $request->app();
             $view    = $this->config['view_dir_name'];
 
-            if (is_dir($this->app->getAppPath() . $view)) {
-                $path = isset($app) ? $this->app->getBasePath() . ($appName ? $appName . DIRECTORY_SEPARATOR : '') . $view . DIRECTORY_SEPARATOR : $this->app->getAppPath() . $view . DIRECTORY_SEPARATOR;
+            if (is_dir($this->app->getAppPath().$view)) {
+                $path = isset($app) ? $this->app->getBasePath().($appName ? $appName.DIRECTORY_SEPARATOR : '').$view.DIRECTORY_SEPARATOR : $this->app->getAppPath().$view.DIRECTORY_SEPARATOR;
             } else {
-                $path = $this->app->getRootPath() . $view . DIRECTORY_SEPARATOR . ($appName ? $appName . DIRECTORY_SEPARATOR : '');
+                $path = $this->app->getRootPath().$view.DIRECTORY_SEPARATOR.($appName ? $appName.DIRECTORY_SEPARATOR : '');
             }
         }
 
@@ -143,7 +143,7 @@ 
             $controller = $request->controller();
             if (strpos($controller, '.')) {
                 $pos        = strrpos($controller, '.');
-                $controller = substr($controller, 0, $pos) . '.' . Str::snake(substr($controller, $pos + 1));
+                $controller = substr($controller, 0, $pos).'.'.Str::snake(substr($controller, $pos + 1));
             } else {
                 $controller = Str::snake($controller);
             }
@@ -159,16 +159,16 @@ 
                         $template = Str::snake($request->action());
                     }
 
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     /**

tests/SessionTest.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
         $this->config = m::mock(Config::class)->makePartial();
 
         $this->app->shouldReceive('get')->with('config')->andReturn($this->config);
-        $handlerClass = "\\think\\session\\driver\\Test" . Str::random(10);
+        $handlerClass = "\\think\\session\\driver\\Test".Str::random(10);
         $this->config->shouldReceive("get")->with("session.type", "file")->andReturn($handlerClass);
         $this->session = new Session($this->app);
 
-        $this->handler = m::mock('overload:' . $handlerClass, SessionHandlerInterface::class);
+        $this->handler = m::mock('overload:'.$handlerClass, SessionHandlerInterface::class);
     }
 
     public function testLoadData()

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 > $item->getMTime() + $lifetime;
         });
 
@@ -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/session/driver/Cache.php

Spacing +3 added lines, -3 removed lines

@@ -35,16 +35,16 @@
 
     public function read(string $sessionId): string
     {
-        return (string) $this->handler->get($this->prefix . $sessionId);
+        return (string) $this->handler->get($this->prefix.$sessionId);
     }
 
     public function delete(string $sessionId): bool
     {
-        return $this->handler->delete($this->prefix . $sessionId);
+        return $this->handler->delete($this->prefix.$sessionId);
     }
 
     public function write(string $sessionId, string $data): bool
     {
-        return $this->handler->set($this->prefix . $sessionId, $data, $this->expire);
+        return $this->handler->set($this->prefix.$sessionId, $data, $this->expire);
     }
 }