top-think / framework

library/think/Model.php

Spacing +1 added lines, -1 removed lines

@@ -323,7 +323,7 @@
 
         // 全局作用域
         if (true === $useBaseQuery && method_exists($this, 'base')) {
-            call_user_func_array([$this, 'base'], [ & $query]);
+            call_user_func_array([$this, 'base'], [& $query]);
         }
 
         $globalScope = is_array($useBaseQuery) && $useBaseQuery ? $useBaseQuery : $this->globalScope;

library/think/File.php

Spacing +6 added lines, -6 removed lines

@@ -356,10 +356,10 @@ 
             return false;
         }
 
-        $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
         // 文件保存命名规则
         $saveName = $this->buildSaveName($savename, $autoAppendExt);
-        $filename = $path . $saveName;
+        $filename = $path.$saveName;
 
         // 检测目录
         if (false === $this->checkPath(dirname($filename))) {
@@ -406,7 +406,7 @@ 
         }
 
         if ($autoAppendExt && false === strpos($savename, '.')) {
-            $savename .= '.' . pathinfo($this->getInfo('name'), PATHINFO_EXTENSION);
+            $savename .= '.'.pathinfo($this->getInfo('name'), PATHINFO_EXTENSION);
         }
 
         return $savename;
@@ -424,16 +424,16 @@ 
         } else {
             switch ($this->rule) {
                 case 'date':
-                    $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                    $savename = date('Ymd').DIRECTORY_SEPARATOR.md5(microtime(true));
                     break;
                 default:
                     if (in_array($this->rule, hash_algos())) {
                         $hash     = $this->hash($this->rule);
-                        $savename = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
+                        $savename = substr($hash, 0, 2).DIRECTORY_SEPARATOR.substr($hash, 2);
                     } elseif (is_callable($this->rule)) {
                         $savename = call_user_func($this->rule);
                     } else {
-                        $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                        $savename = date('Ymd').DIRECTORY_SEPARATOR.md5(microtime(true));
                     }
             }
         }

library/think/Route.php

Spacing +8 added lines, -8 removed lines

@@ -327,7 +327,7 @@ 
         $domainName = is_array($name) ? array_shift($name) : $name;
 
         if ('*' != $domainName && false === strpos($domainName, '.')) {
-            $domainName .= '.' . $this->request->rootDomain();
+            $domainName .= '.'.$this->request->rootDomain();
         }
 
         if (!isset($this->domains[$domainName])) {
@@ -345,7 +345,7 @@ 
             $root = $this->request->rootDomain();
             foreach ($name as $item) {
                 if (false === strpos($item, '.')) {
-                    $item .= '.' . $root;
+                    $item .= '.'.$root;
                 }
 
                 $this->domains[$item] = $domainName;
@@ -395,13 +395,13 @@ 
         } elseif (true === $domain) {
             return $this->bind;
         } elseif (false === strpos($domain, '.')) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         $subDomain = $this->request->subDomain();
 
         if (strpos($subDomain, '.')) {
-            $name = '*' . strstr($subDomain, '.');
+            $name = '*'.strstr($subDomain, '.');
         }
 
         if (isset($this->bind[$domain])) {
@@ -709,10 +709,10 @@ 
         $group = new RuleGroup($this, $this->group, $rule, null, $option, $pattern);
 
         foreach ($this->methodPrefix as $type => $val) {
-            $group->addRule('<action>', $val . '<action>', $type);
+            $group->addRule('<action>', $val.'<action>', $type);
         }
 
-        return $group->prefix($route . '/');
+        return $group->prefix($route.'/');
     }
 
     /**
@@ -927,9 +927,9 @@ 
             if ($subDomain && 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)) {
                 // 泛二级域名

library/think/Console.php

Spacing +11 added lines, -11 removed lines

@@ -136,7 +136,7 @@ 
 
                 foreach ($files as $file) {
                     if (pathinfo($file, PATHINFO_EXTENSION) == 'php') {
-                        include $config['auto_path'] . $file;
+                        include $config['auto_path'].$file;
                     }
                 }
 
@@ -145,7 +145,7 @@ 
             }
         }
 
-        $file = Container::get('env')->get('app_path') . 'command.php';
+        $file = Container::get('env')->get('app_path').'command.php';
 
         if (is_file($file)) {
             $appCommands = include $file;
@@ -513,10 +513,10 @@ 
     public function findNamespace($namespace)
     {
         $allNamespaces = $this->getNamespaces();
-        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr          = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $namespace);
-        $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
+        $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -553,13 +553,13 @@ 
     {
         $allCommands = array_keys($this->commands);
 
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $name);
 
-        $commands = preg_grep('{^' . $expr . '}', $allCommands);
+        $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
-        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
+        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
             if (false !== $pos = strrpos($name, ':')) {
                 $this->findNamespace(substr($name, 0, $pos));
             }
@@ -779,7 +779,7 @@ 
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
             return $lev < 2 * $threshold;
         });
         asort($alternatives);
@@ -810,7 +810,7 @@ 
 
         foreach ($parts as $part) {
             if (count($namespaces)) {
-                $namespaces[] = end($namespaces) . ':' . $part;
+                $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
             }

library/think/Build.php

Spacing +46 added lines, -46 removed lines

@@ -42,12 +42,12 @@ 
     public function run(array $build = [], $namespace = 'app', $suffix = false)
     {
         // 锁定
-        $lockfile = $this->basePath . 'build.lock';
+        $lockfile = $this->basePath.'build.lock';
 
         if (is_writable($lockfile)) {
             return;
         } elseif (!touch($lockfile)) {
-            throw new Exception('应用目录[' . $this->basePath . ']不可写，目录无法自动生成！<BR>请手动生成项目目录~', 10006);
+            throw new Exception('应用目录['.$this->basePath.']不可写，目录无法自动生成！<BR>请手动生成项目目录~', 10006);
         }
 
         foreach ($build as $module => $list) {
@@ -76,7 +76,7 @@ 
     protected function buildDir($list)
     {
         foreach ($list as $dir) {
-            $this->checkDirBuild($this->basePath . $dir);
+            $this->checkDirBuild($this->basePath.$dir);
         }
     }
 
@@ -89,13 +89,13 @@ 
     protected function buildFile($list)
     {
         foreach ($list as $file) {
-            if (!is_dir($this->basePath . dirname($file))) {
+            if (!is_dir($this->basePath.dirname($file))) {
                 // 创建目录
-                mkdir($this->basePath . dirname($file), 0755, true);
+                mkdir($this->basePath.dirname($file), 0755, true);
             }
 
-            if (!is_file($this->basePath . $file)) {
-                file_put_contents($this->basePath . $file, 'php' == pathinfo($file, PATHINFO_EXTENSION) ? "<?php\n" : '');
+            if (!is_file($this->basePath.$file)) {
+                file_put_contents($this->basePath.$file, 'php' == pathinfo($file, PATHINFO_EXTENSION) ? "<?php\n" : '');
             }
         }
     }
@@ -113,9 +113,9 @@ 
     {
         $module = $module ? $module : '';
 
-        if (!is_dir($this->basePath . $module)) {
+        if (!is_dir($this->basePath.$module)) {
             // 创建模块目录
-            mkdir($this->basePath . $module);
+            mkdir($this->basePath.$module);
         }
 
         if (basename($this->app->getRuntimePath()) != $module) {
@@ -135,26 +135,26 @@ 
 
         // 创建子目录和文件
         foreach ($list as $path => $file) {
-            $modulePath = $this->basePath . $module . DIRECTORY_SEPARATOR;
+            $modulePath = $this->basePath.$module.DIRECTORY_SEPARATOR;
             if ('__dir__' == $path) {
                 // 生成子目录
                 foreach ($file as $dir) {
-                    $this->checkDirBuild($modulePath . $dir);
+                    $this->checkDirBuild($modulePath.$dir);
                 }
             } elseif ('__file__' == $path) {
                 // 生成（空白）文件
                 foreach ($file as $name) {
-                    if (!is_file($modulePath . $name)) {
-                        file_put_contents($modulePath . $name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? "<?php\n" : '');
+                    if (!is_file($modulePath.$name)) {
+                        file_put_contents($modulePath.$name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? "<?php\n" : '');
                     }
                 }
             } else {
                 // 生成相关MVC文件
                 foreach ($file as $val) {
                     $val      = trim($val);
-                    $filename = $modulePath . $path . DIRECTORY_SEPARATOR . $val . ($suffix ? ucfirst($path) : '') . '.php';
-                    $space    = $namespace . '\\' . ($module ? $module . '\\' : '') . $path;
-                    $class    = $val . ($suffix ? ucfirst($path) : '');
+                    $filename = $modulePath.$path.DIRECTORY_SEPARATOR.$val.($suffix ? ucfirst($path) : '').'.php';
+                    $space    = $namespace.'\\'.($module ? $module.'\\' : '').$path;
+                    $class    = $val.($suffix ? ucfirst($path) : '');
                     switch ($path) {
                         case 'controller': // 控制器
                             $content = "<?php\nnamespace {$space};\n\nclass {$class}\n{\n\n}";
@@ -163,7 +163,7 @@ 
                             $content = "<?php\nnamespace {$space};\n\nuse think\Model;\n\nclass {$class} extends Model\n{\n\n}";
                             break;
                         case 'view': // 视图
-                            $filename = $modulePath . $path . DIRECTORY_SEPARATOR . $val . '.html';
+                            $filename = $modulePath.$path.DIRECTORY_SEPARATOR.$val.'.html';
                             $this->checkDirBuild(dirname($filename));
                             $content = '';
                             break;
@@ -190,14 +190,14 @@ 
     public function buildRoute($suffix = false, $layer = '')
     {
         $namespace = $this->app->getNameSpace();
-        $content   = '<?php ' . PHP_EOL . '//根据 Annotation 自动生成的路由规则';
+        $content   = '<?php '.PHP_EOL.'//根据 Annotation 自动生成的路由规则';
 
         if (!$layer) {
             $layer = $this->app->config('app.url_controller_layer');
         }
 
         if ($this->app->config('app.app_multi_module')) {
-            $modules = glob($this->basePath . '*', GLOB_ONLYDIR);
+            $modules = glob($this->basePath.'*', GLOB_ONLYDIR);
 
             foreach ($modules as $module) {
                 $module = basename($module);
@@ -206,15 +206,15 @@ 
                     continue;
                 }
 
-                $path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR;
+                $path = $this->basePath.$module.DIRECTORY_SEPARATOR.$layer.DIRECTORY_SEPARATOR;
                 $content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer);
             }
         } else {
-            $path = $this->basePath . $layer . DIRECTORY_SEPARATOR;
+            $path = $this->basePath.$layer.DIRECTORY_SEPARATOR;
             $content .= $this->buildDirRoute($path, $namespace, '', $suffix, $layer);
         }
 
-        $filename = $this->app->getRuntimePath() . 'build_route.php';
+        $filename = $this->app->getRuntimePath().'build_route.php';
         file_put_contents($filename, $content);
 
         return $filename;
@@ -233,17 +233,17 @@ 
     protected function buildDirRoute($path, $namespace, $module, $suffix, $layer)
     {
         $content     = '';
-        $controllers = glob($path . '*.php');
+        $controllers = glob($path.'*.php');
 
         foreach ($controllers as $controller) {
             $controller = basename($controller, '.php');
 
-            $class = new \ReflectionClass($namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $controller);
+            $class = new \ReflectionClass($namespace.'\\'.($module ? $module.'\\' : '').$layer.'\\'.$controller);
 
             if (strpos($layer, '\\')) {
                 // 多级控制器
                 $level      = str_replace(DIRECTORY_SEPARATOR, '.', substr($layer, 11));
-                $controller = $level . '.' . $controller;
+                $controller = $level.'.'.$controller;
                 $length     = strlen(strstr($layer, '\\', true));
             } else {
                 $length = strlen($layer);
@@ -256,10 +256,10 @@ 
             $content .= $this->getControllerRoute($class, $module, $controller);
         }
 
-        $subDir = glob($path . '*', GLOB_ONLYDIR);
+        $subDir = glob($path.'*', GLOB_ONLYDIR);
 
         foreach ($subDir as $dir) {
-            $content .= $this->buildDirRoute($dir . DIRECTORY_SEPARATOR, $namespace, $module, $suffix, $layer . '\\' . basename($dir));
+            $content .= $this->buildDirRoute($dir.DIRECTORY_SEPARATOR, $namespace, $module, $suffix, $layer.'\\'.basename($dir));
         }
 
         return $content;
@@ -280,14 +280,14 @@ 
 
         if (false !== strpos($comment, '@route(')) {
             $comment = $this->parseRouteComment($comment);
-            $route   = ($module ? $module . '/' : '') . $controller;
-            $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $route . '\')', $comment);
-            $content .= PHP_EOL . $comment;
+            $route   = ($module ? $module.'/' : '').$controller;
+            $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\''.$route.'\')', $comment);
+            $content .= PHP_EOL.$comment;
         } elseif (false !== strpos($comment, '@alias(')) {
             $comment = $this->parseRouteComment($comment, '@alias(');
-            $route   = ($module ? $module . '/' : '') . $controller;
-            $comment = preg_replace('/alias\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::alias(\1,\'' . $route . '\')', $comment);
-            $content .= PHP_EOL . $comment;
+            $route   = ($module ? $module.'/' : '').$controller;
+            $comment = preg_replace('/alias\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::alias(\1,\''.$route.'\')', $comment);
+            $content .= PHP_EOL.$comment;
         }
 
         $methods = $class->getMethods(\ReflectionMethod::IS_PUBLIC);
@@ -295,7 +295,7 @@ 
         foreach ($methods as $method) {
             $comment = $this->getMethodRouteComment($module, $controller, $method);
             if ($comment) {
-                $content .= PHP_EOL . $comment;
+                $content .= PHP_EOL.$comment;
             }
         }
 
@@ -313,18 +313,18 @@ 
     {
         $comment = substr($comment, 3, -2);
         $comment = explode(PHP_EOL, substr(strstr(trim($comment), $tag), 1));
-        $comment = array_map(function ($item) {return trim(trim($item), ' \t*');}, $comment);
+        $comment = array_map(function($item) {return trim(trim($item), ' \t*'); }, $comment);
 
         if (count($comment) > 1) {
             $key     = array_search('', $comment);
             $comment = array_slice($comment, 0, false === $key ? 1 : $key);
         }
 
-        $comment = implode(PHP_EOL . "\t", $comment) . ';';
+        $comment = implode(PHP_EOL."\t", $comment).';';
 
         if (strpos($comment, '{')) {
-            $comment = preg_replace_callback('/\{\s?.*?\s?\}/s', function ($matches) {
-                return false !== strpos($matches[0], '"') ? '[' . substr(var_export(json_decode($matches[0], true), true), 7, -1) . ']' : $matches[0];
+            $comment = preg_replace_callback('/\{\s?.*?\s?\}/s', function($matches) {
+                return false !== strpos($matches[0], '"') ? '['.substr(var_export(json_decode($matches[0], true), true), 7, -1).']' : $matches[0];
             }, $comment);
         }
         return $comment;
@@ -350,9 +350,9 @@ 
                 $action = substr($action, 0, -strlen($suffix));
             }
 
-            $route   = ($module ? $module . '/' : '') . $controller . '/' . $action;
-            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')', $comment);
-            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')', $comment);
+            $route   = ($module ? $module.'/' : '').$controller.'/'.$action;
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\''.$route.'\')', $comment);
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\''.$route.'\')', $comment);
 
             return $comment;
         }
@@ -368,10 +368,10 @@ 
      */
     protected function buildHello($module, $namespace, $suffix = false)
     {
-        $filename = $this->basePath . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'controller' . DIRECTORY_SEPARATOR . 'Index' . ($suffix ? 'Controller' : '') . '.php';
+        $filename = $this->basePath.($module ? $module.DIRECTORY_SEPARATOR : '').'controller'.DIRECTORY_SEPARATOR.'Index'.($suffix ? 'Controller' : '').'.php';
         if (!is_file($filename)) {
-            $content = file_get_contents($this->app->getThinkPath() . 'tpl' . DIRECTORY_SEPARATOR . 'default_index.tpl');
-            $content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [$namespace, $module ? $module . '\\' : '', 'controller', $suffix ? 'Controller' : ''], $content);
+            $content = file_get_contents($this->app->getThinkPath().'tpl'.DIRECTORY_SEPARATOR.'default_index.tpl');
+            $content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [$namespace, $module ? $module.'\\' : '', 'controller', $suffix ? 'Controller' : ''], $content);
             $this->checkDirBuild(dirname($filename));
 
             file_put_contents($filename, $content);
@@ -386,14 +386,14 @@ 
      */
     protected function buildCommon($module)
     {
-        $filename = $this->app->getConfigPath() . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'app.php';
+        $filename = $this->app->getConfigPath().($module ? $module.DIRECTORY_SEPARATOR : '').'app.php';
         $this->checkDirBuild(dirname($filename));
 
         if (!is_file($filename)) {
             file_put_contents($filename, "<?php\n//配置文件\nreturn [\n\n];");
         }
 
-        $filename = $this->basePath . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'common.php';
+        $filename = $this->basePath.($module ? $module.DIRECTORY_SEPARATOR : '').'common.php';
 
         if (!is_file($filename)) {
             file_put_contents($filename, "<?php\n");

library/think/App.php

Spacing +52 added lines, -52 removed lines

@@ -126,7 +126,7 @@ 
 
     public function __construct($appPath = '')
     {
-        $this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
+        $this->thinkPath = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;
         $this->path($appPath);
     }
 
@@ -150,7 +150,7 @@ 
      */
     public function path($path)
     {
-        $this->appPath = $path ? realpath($path) . DIRECTORY_SEPARATOR : $this->getAppPath();
+        $this->appPath = $path ? realpath($path).DIRECTORY_SEPARATOR : $this->getAppPath();
 
         return $this;
     }
@@ -170,24 +170,24 @@ 
         $this->beginTime   = microtime(true);
         $this->beginMem    = memory_get_usage();
 
-        $this->rootPath    = dirname($this->appPath) . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
-        $this->routePath   = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
-        $this->configPath  = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        $this->rootPath    = dirname($this->appPath).DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
+        $this->routePath   = $this->rootPath.'route'.DIRECTORY_SEPARATOR;
+        $this->configPath  = $this->rootPath.'config'.DIRECTORY_SEPARATOR;
 
         static::setInstance($this);
 
         $this->instance('app', $this);
 
         // 加载环境变量配置文件
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
+        if (is_file($this->rootPath.'.env')) {
+            $this->env->load($this->rootPath.'.env');
         }
 
         $this->configExt = $this->env->get('config_ext', '.php');
 
         // 加载惯例配置文件
-        $this->config->set(include $this->thinkPath . 'convention.php');
+        $this->config->set(include $this->thinkPath.'convention.php');
 
         // 设置路径环境变量
         $this->env->set([
@@ -197,8 +197,8 @@ 
             'config_path'  => $this->configPath,
             'route_path'   => $this->routePath,
             'runtime_path' => $this->runtimePath,
-            'extend_path'  => $this->rootPath . 'extend' . DIRECTORY_SEPARATOR,
-            'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,
+            'extend_path'  => $this->rootPath.'extend'.DIRECTORY_SEPARATOR,
+            'vendor_path'  => $this->rootPath.'vendor'.DIRECTORY_SEPARATOR,
         ]);
 
         $this->namespace = $this->env->get('app_namespace', $this->namespace);
@@ -268,61 +268,61 @@ 
     public function init($module = '')
     {
         // 定位模块目录
-        $module = $module ? $module . DIRECTORY_SEPARATOR : '';
-        $path   = $this->appPath . $module;
+        $module = $module ? $module.DIRECTORY_SEPARATOR : '';
+        $path   = $this->appPath.$module;
 
         // 加载初始化文件
-        if (is_file($path . 'init.php')) {
-            include $path . 'init.php';
-        } elseif (is_file($this->runtimePath . $module . 'init.php')) {
-            include $this->runtimePath . $module . 'init.php';
+        if (is_file($path.'init.php')) {
+            include $path.'init.php';
+        } elseif (is_file($this->runtimePath.$module.'init.php')) {
+            include $this->runtimePath.$module.'init.php';
         } else {
             // 加载行为扩展文件
-            if (is_file($path . 'tags.php')) {
-                $tags = include $path . 'tags.php';
+            if (is_file($path.'tags.php')) {
+                $tags = include $path.'tags.php';
                 if (is_array($tags)) {
                     $this->hook->import($tags);
                 }
             }
 
             // 加载公共文件
-            if (is_file($path . 'common.php')) {
-                include_once $path . 'common.php';
+            if (is_file($path.'common.php')) {
+                include_once $path.'common.php';
             }
 
             if ('' == $module) {
                 // 加载系统助手函数
-                include $this->thinkPath . 'helper.php';
+                include $this->thinkPath.'helper.php';
             }
 
             // 加载中间件
-            if (is_file($path . 'middleware.php')) {
-                $middleware = include $path . 'middleware.php';
+            if (is_file($path.'middleware.php')) {
+                $middleware = include $path.'middleware.php';
                 if (is_array($middleware)) {
                     $this->middleware->import($middleware);
                 }
             }
 
             // 注册服务的容器对象实例
-            if (is_file($path . 'provider.php')) {
-                $provider = include $path . 'provider.php';
+            if (is_file($path.'provider.php')) {
+                $provider = include $path.'provider.php';
                 if (is_array($provider)) {
                     $this->bindTo($provider);
                 }
             }
 
             // 自动读取配置文件
-            if (is_dir($path . 'config')) {
-                $dir = $path . 'config' . DIRECTORY_SEPARATOR;
-            } elseif (is_dir($this->configPath . $module)) {
-                $dir = $this->configPath . $module;
+            if (is_dir($path.'config')) {
+                $dir = $path.'config'.DIRECTORY_SEPARATOR;
+            } elseif (is_dir($this->configPath.$module)) {
+                $dir = $this->configPath.$module;
             }
 
             $files = isset($dir) ? scandir($dir) : [];
 
             foreach ($files as $file) {
-                if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
-                    $this->config->load($dir . $file, pathinfo($file, PATHINFO_FILENAME));
+                if ('.'.pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
+                    $this->config->load($dir.$file, pathinfo($file, PATHINFO_FILENAME));
                 }
             }
         }
@@ -356,7 +356,7 @@ 
         $this->cache->init($config['cache'], true);
 
         // 加载当前模块语言包
-        $this->lang->load($this->appPath . $module . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php');
+        $this->lang->load($this->appPath.$module.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php');
 
         // 模块请求缓存检查
         $this->checkRequestCache(
@@ -387,7 +387,7 @@ 
             } elseif ($this->config('app.auto_bind_module')) {
                 // 入口自动绑定
                 $name = pathinfo($this->request->baseFile(), PATHINFO_FILENAME);
-                if ($name && 'index' != $name && is_dir($this->appPath . $name)) {
+                if ($name && 'index' != $name && is_dir($this->appPath.$name)) {
                     $this->route->bind($name);
                 }
             }
@@ -407,9 +407,9 @@ 
 
             // 记录路由和请求信息
             if ($this->appDebug) {
-                $this->log('[ ROUTE ] ' . var_export($this->request->routeInfo(), true));
-                $this->log('[ HEADER ] ' . var_export($this->request->header(), true));
-                $this->log('[ PARAM ] ' . var_export($this->request->param(), true));
+                $this->log('[ ROUTE ] '.var_export($this->request->routeInfo(), true));
+                $this->log('[ HEADER ] '.var_export($this->request->header(), true));
+                $this->log('[ PARAM ] '.var_export($this->request->param(), true));
             }
 
             // 监听app_begin
@@ -428,7 +428,7 @@ 
             $data     = $exception->getResponse();
         }
 
-        $this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {
+        $this->middleware->add(function(Request $request, $next) use ($dispatch, $data) {
             return is_null($data) ? $dispatch->run() : $data;
         });
 
@@ -446,7 +446,7 @@ 
             $closure  = $this->config->get('route_check_cache_key');
             $routeKey = $closure($this->request);
         } else {
-            $routeKey = md5($this->request->baseUrl(true) . ':' . $this->request->method());
+            $routeKey = md5($this->request->baseUrl(true).':'.$this->request->method());
         }
 
         return $routeKey;
@@ -466,8 +466,8 @@ 
 
         // 加载系统语言包
         $this->lang->load([
-            $this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
-            $this->appPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
+            $this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',
+            $this->appPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',
         ]);
     }
 
@@ -551,7 +551,7 @@ 
         $files = scandir($this->routePath);
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                $filename = $this->routePath . $file;
+                $filename = $this->routePath.$file;
                 // 导入路由配置
                 $rules = include $filename;
                 if (is_array($rules)) {
@@ -567,7 +567,7 @@ 
                 $this->build->buildRoute($suffix);
             }
 
-            $filename = $this->runtimePath . 'build_route.php';
+            $filename = $this->runtimePath.'build_route.php';
 
             if (is_file($filename)) {
                 include $filename;
@@ -668,7 +668,7 @@ 
      */
     public function create($name, $layer, $appendSuffix = false, $common = 'common')
     {
-        $guid = $name . $layer;
+        $guid = $name.$layer;
 
         if ($this->__isset($guid)) {
             return $this->__get($guid);
@@ -679,11 +679,11 @@ 
         if (class_exists($class)) {
             $object = $this->__get($class);
         } else {
-            $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);
+            $class = str_replace('\\'.$module.'\\', '\\'.$common.'\\', $class);
             if (class_exists($class)) {
                 $object = $this->__get($class);
             } else {
-                throw new ClassNotFoundException('class not exists:' . $class, $class);
+                throw new ClassNotFoundException('class not exists:'.$class, $class);
             }
         }
 
@@ -727,7 +727,7 @@ 
             return $this->make($emptyClass, true);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 
     /**
@@ -788,7 +788,7 @@ 
             }
         }
 
-        return $this->invokeMethod([$class, $action . $this->config('action_suffix')], $vars);
+        return $this->invokeMethod([$class, $action.$this->config('action_suffix')], $vars);
     }
 
     /**
@@ -804,10 +804,10 @@ 
     {
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
-        $class = Loader::parseName(array_pop($array), 1) . ($this->suffix || $appendSuffix ? ucfirst($layer) : '');
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $class = Loader::parseName(array_pop($array), 1).($this->suffix || $appendSuffix ? ucfirst($layer) : '');
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.($module ? $module.'\\' : '').$layer.'\\'.$path.$class;
     }
 
     /**
@@ -870,7 +870,7 @@ 
     public function getAppPath()
     {
         if (is_null($this->appPath)) {
-            $this->appPath = Loader::getRootPath() . 'application' . DIRECTORY_SEPARATOR;
+            $this->appPath = Loader::getRootPath().'application'.DIRECTORY_SEPARATOR;
         }
 
         return $this->appPath;

library/think/Log.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
         if (is_string($msg) && !empty($context)) {
             $replace = [];
             foreach ($context as $key => $val) {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             }
 
             $msg = strtr($msg, $replace);

library/think/Session.php

Spacing +3 added lines, -3 removed lines

@@ -188,11 +188,11 @@ 
 
         if (!empty($config['type'])) {
             // 读取session驱动
-            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\'.ucwords($config['type']);
 
             // 检查驱动类
             if (!class_exists($class) || !session_set_save_handler(new $class($config))) {
-                throw new ClassNotFoundException('error session handler:' . $class, $class);
+                throw new ClassNotFoundException('error session handler:'.$class, $class);
             }
         }
 
@@ -301,7 +301,7 @@ 
 
         if (!empty($config['type']) && isset($config['use_lock']) && $config['use_lock']) {
             // 读取session驱动
-            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\'.ucwords($config['type']);
 
             // 检查驱动类及类中是否存在 lock 和 unlock 函数
             if (class_exists($class) && method_exists($class, 'lock') && method_exists($class, 'unlock')) {

library/think/Loader.php

Spacing +28 added lines, -28 removed lines

@@ -65,11 +65,11 @@ 
 
         $path = realpath(dirname($scriptName));
 
-        if (!is_file($path . DIRECTORY_SEPARATOR . 'think')) {
+        if (!is_file($path.DIRECTORY_SEPARATOR.'think')) {
             $path = dirname($path);
         }
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
     // 注册自动加载机制
@@ -80,12 +80,12 @@ 
 
         $rootPath = self::getRootPath();
 
-        self::$composerPath = $rootPath . 'vendor' . DIRECTORY_SEPARATOR . 'composer' . DIRECTORY_SEPARATOR;
+        self::$composerPath = $rootPath.'vendor'.DIRECTORY_SEPARATOR.'composer'.DIRECTORY_SEPARATOR;
 
         // Composer自动加载支持
         if (is_dir(self::$composerPath)) {
-            if (is_file(self::$composerPath . 'autoload_static.php')) {
-                require self::$composerPath . 'autoload_static.php';
+            if (is_file(self::$composerPath.'autoload_static.php')) {
+                require self::$composerPath.'autoload_static.php';
 
                 $declaredClass = get_declared_classes();
                 $composerClass = array_pop($declaredClass);
@@ -103,16 +103,16 @@ 
         // 注册命名空间定义
         self::addNamespace([
             'think'  => __DIR__,
-            'traits' => dirname(__DIR__) . DIRECTORY_SEPARATOR . 'traits',
+            'traits' => dirname(__DIR__).DIRECTORY_SEPARATOR.'traits',
         ]);
 
         // 加载类库映射文件
-        if (is_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php')) {
-            self::addClassMap(__include_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php'));
+        if (is_file($rootPath.'runtime'.DIRECTORY_SEPARATOR.'classmap.php')) {
+            self::addClassMap(__include_file($rootPath.'runtime'.DIRECTORY_SEPARATOR.'classmap.php'));
         }
 
         // 自动加载extend目录
-        self::addAutoLoadDir($rootPath . 'extend');
+        self::addAutoLoadDir($rootPath.'extend');
     }
 
     // 自动加载
@@ -148,14 +148,14 @@ 
         }
 
         // 查找 PSR-4
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).'.php';
 
         $first = $class[0];
         if (isset(self::$prefixLengthsPsr4[$first])) {
             foreach (self::$prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach (self::$prefixDirsPsr4[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir.DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -165,7 +165,7 @@ 
 
         // 查找 PSR-4 fallback dirs
         foreach (self::$fallbackDirsPsr4 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -177,14 +177,14 @@ 
             . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).'.php';
         }
 
         if (isset(self::$prefixesPsr0[$first])) {
             foreach (self::$prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -194,7 +194,7 @@ 
 
         // 查找 PSR-0 fallback dirs
         foreach (self::$fallbackDirsPsr0 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }
@@ -217,10 +217,10 @@ 
     {
         if (is_array($namespace)) {
             foreach ($namespace as $prefix => $paths) {
-                self::addPsr4($prefix . '\\', rtrim($paths, DIRECTORY_SEPARATOR), true);
+                self::addPsr4($prefix.'\\', rtrim($paths, DIRECTORY_SEPARATOR), true);
             }
         } else {
-            self::addPsr4($namespace . '\\', rtrim($path, DIRECTORY_SEPARATOR), true);
+            self::addPsr4($namespace.'\\', rtrim($path, DIRECTORY_SEPARATOR), true);
         }
     }
 
@@ -322,29 +322,29 @@ 
     // 注册composer自动加载
     public static function registerComposerLoader($composerPath)
     {
-        if (is_file($composerPath . 'autoload_namespaces.php')) {
-            $map = require $composerPath . 'autoload_namespaces.php';
+        if (is_file($composerPath.'autoload_namespaces.php')) {
+            $map = require $composerPath.'autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
                 self::addPsr0($namespace, $path);
             }
         }
 
-        if (is_file($composerPath . 'autoload_psr4.php')) {
-            $map = require $composerPath . 'autoload_psr4.php';
+        if (is_file($composerPath.'autoload_psr4.php')) {
+            $map = require $composerPath.'autoload_psr4.php';
             foreach ($map as $namespace => $path) {
                 self::addPsr4($namespace, $path);
             }
         }
 
-        if (is_file($composerPath . 'autoload_classmap.php')) {
-            $classMap = require $composerPath . 'autoload_classmap.php';
+        if (is_file($composerPath.'autoload_classmap.php')) {
+            $classMap = require $composerPath.'autoload_classmap.php';
             if ($classMap) {
                 self::addClassMap($classMap);
             }
         }
 
-        if (is_file($composerPath . 'autoload_files.php')) {
-            self::$files = require $composerPath . 'autoload_files.php';
+        if (is_file($composerPath.'autoload_files.php')) {
+            self::$files = require $composerPath.'autoload_files.php';
         }
     }
 
@@ -372,7 +372,7 @@ 
     public static function parseName($name, $type = 0, $ucfirst = true)
     {
         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);
             return $ucfirst ? ucfirst($name) : lcfirst($name);
@@ -390,12 +390,12 @@ 
      */
     public static function factory($name, $namespace = '', ...$args)
     {
-        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+        $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name);
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, $args);
         } else {
-            throw new ClassNotFoundException('class not exists:' . $class, $class);
+            throw new ClassNotFoundException('class not exists:'.$class, $class);
         }
     }
 }