top-think / framework

src/think/Http.php

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -56,7 +56,7 @@ 
     public function __construct(App $app)
     {
         $this->app   = $app;
-        $this->multi = is_dir($this->app->getBasePath() . 'controller') ? false : true;
+        $this->multi = is_dir($this->app->getBasePath().'controller') ? false : true;
     }
 
     /**
@@ -172,8 +172,8 @@ 
         $this->initialize();
 
         // 加载全局中间件
-        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');
         }
 
         if ($this->multi) {
@@ -186,7 +186,7 @@ 
         // 监听HttpRun
         $this->app->event->trigger('HttpRun');
 
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -202,7 +202,7 @@ 
     {
         // 加载路由定义
         if (is_dir($this->getRoutePath())) {
-            $files = glob($this->getRoutePath() . '*.php');
+            $files = glob($this->getRoutePath().'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -218,7 +218,7 @@ 
      */
     protected function getRoutePath(): string
     {
-        return $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($this->isMulti() ? $this->getName() . DIRECTORY_SEPARATOR : '');
+        return $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($this->isMulti() ? $this->getName().DIRECTORY_SEPARATOR : '');
     }
 
     /**
@@ -303,7 +303,7 @@ 
                         $appName = $map[$name];
                     }
                 } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) {
-                    throw new HttpException(404, 'app not exists:' . $name);
+                    throw new HttpException(404, 'app not exists:'.$name);
                 } elseif ($name && isset($map['*'])) {
                     $appName = $map['*'];
                 } else {
@@ -311,7 +311,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -331,41 +331,41 @@ 
     {
         $this->name = $appName;
         $this->app->request->setApp($appName);
-        $this->app->setAppPath($this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR);
-        $this->app->setRuntimePath($this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR);
+        $this->app->setAppPath($this->path ?: $this->app->getBasePath().$appName.DIRECTORY_SEPARATOR);
+        $this->app->setRuntimePath($this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$appName.DIRECTORY_SEPARATOR);
 
         //加载app文件
         if (is_dir($this->app->getAppPath())) {
             $appPath = $this->app->getAppPath();
 
-            if (is_file($appPath . 'common.php')) {
-                include_once $appPath . 'common.php';
+            if (is_file($appPath.'common.php')) {
+                include_once $appPath.'common.php';
             }
 
             $configPath = $this->app->getConfigPath();
 
             $files = [];
 
-            if (is_dir($configPath . $appName)) {
-                $files = array_merge($files, glob($configPath . $appName . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
-            } elseif (is_dir($appPath . 'config')) {
-                $files = array_merge($files, glob($appPath . 'config' . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
+            if (is_dir($configPath.$appName)) {
+                $files = array_merge($files, glob($configPath.$appName.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
+            } elseif (is_dir($appPath.'config')) {
+                $files = array_merge($files, glob($appPath.'config'.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
             }
 
             foreach ($files as $file) {
                 $this->app->config->load($file, pathinfo($file, PATHINFO_FILENAME));
             }
 
-            if (is_file($appPath . 'event.php')) {
-                $this->app->loadEvent(include $appPath . 'event.php');
+            if (is_file($appPath.'event.php')) {
+                $this->app->loadEvent(include $appPath.'event.php');
             }
 
-            if (is_file($appPath . 'middleware.php')) {
-                $this->app->middleware->import(include $appPath . 'middleware.php');
+            if (is_file($appPath.'middleware.php')) {
+                $this->app->middleware->import(include $appPath.'middleware.php');
             }
 
-            if (is_file($appPath . 'provider.php')) {
-                $this->app->bind(include $appPath . 'provider.php');
+            if (is_file($appPath.'provider.php')) {
+                $this->app->bind(include $appPath.'provider.php');
             }
         }
 
@@ -373,7 +373,7 @@ 
         $this->app->loadLangPack($this->app->lang->defaultLangSet());
 
         // 设置应用命名空间
-        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName);
+        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\'.$appName);
     }
 
     /**

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

Spacing +7 added lines, -7 removed lines

@@ -29,14 +29,14 @@ 
     {
         $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;
         }
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -51,21 +51,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
         //触发路由载入完成事件
         $this->app->event->trigger(RouteLoaded::class);
 
-        $content = '<?php ' . PHP_EOL . 'return ';
-        $content .= '\think\App::unserialize(\'' . \think\App::serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\think\App::unserialize(\''.\think\App::serialize($this->app->route->getName()).'\');';
         return $content;
     }
 

src/think/console/command/RouteList.php

Spacing +8 added lines, -8 removed lines

@@ -42,15 +42,15 @@ 
     {
         $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) {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR . 'route_list_' . $app . '.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR.'route_list_'.$app.'.php';
         } else {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'route_list.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'route_list.php';
         }
 
         if (is_file($filename)) {
@@ -60,7 +60,7 @@ 
         }
 
         $content = $this->getRouteList($app);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $app = null): string
@@ -69,16 +69,16 @@ 
         $this->app->route->clear();
 
         if ($app) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$app.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;
             }
         }
 
@@ -117,7 +117,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;
 

src/think/Service.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -36,7 +36,7 @@ 
      */
     protected function loadRoutesFrom($path)
     {
-        $this->registerRoutes(function () use ($path) {
+        $this->registerRoutes(function() use ($path) {
             include $path;
         });
     }
@@ -59,7 +59,7 @@ 
     {
         $commands = is_array($commands) ? $commands : func_get_args();
 
-        Console::starting(function (Console $console) use ($commands) {
+        Console::starting(function(Console $console) use ($commands) {
             $console->addCommands($commands);
         });
     }

src/think/route/RuleGroup.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -109,7 +109,7 @@ 
         }
 
         if ($this->parent && $this->parent->getFullName()) {
-            $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
+            $this->fullName = $this->parent->getFullName().($this->name ? '/'.$this->name : '');
         } else {
             $this->fullName = $this->name;
         }
@@ -304,13 +304,13 @@ 
     protected function checkMergeRuleRegex(Request $request, array &$rules, string $url, bool $completeMatch)
     {
         $depr  = $this->router->config('pathinfo_depr');
-        $url   = $depr . str_replace('|', $depr, $url);
+        $url   = $depr.str_replace('|', $depr, $url);
         $regex = [];
         $items = [];
 
         foreach ($rules as $key => $item) {
             if ($item instanceof RuleItem) {
-                $rule = $depr . str_replace('/', $depr, $item->getRule());
+                $rule = $depr.str_replace('/', $depr, $item->getRule());
                 if ($depr == $rule && $depr != $url) {
                     unset($rules[$key]);
                     continue;
@@ -327,21 +327,21 @@ 
                     continue;
                 }
 
-                $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]))) {
                         unset($rules[$key]);
                         continue;
                     }
                 }
 
-                if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+                if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
                     unset($rules[$key]);
                     $pattern = array_merge($this->getPattern(), $item->getPattern());
                     $option  = array_merge($this->getOption(), $item->getOption());
 
-                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key);
+                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_'.$key);
                     $items[$key] = $item;
                 }
             }
@@ -352,7 +352,7 @@ 
         }
 
         try {
-            $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
+            $result = preg_match('/^(?:'.implode('|', $regex).')/u', $url, $match);
         } catch (\Exception $e) {
             throw new Exception('route pattern error');
         }
@@ -369,7 +369,7 @@ 
 
             if (!isset($pos)) {
                 foreach ($regex as $key => $item) {
-                    if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) {
+                    if (0 === strpos(str_replace(['\/', '\-', '\\'.$depr], ['/', '-', $depr], $item), $match[0])) {
                         $pos = $key;
                         break;
                     }
@@ -398,7 +398,7 @@ 
      * @access public
      * @return RuleItem|null
      */
-    public function getMissRule():  ? RuleItem
+    public function getMissRule(): ? RuleItem
     {
         return $this->miss;
     }
@@ -484,7 +484,7 @@ 
     public function prefix(string $prefix)
     {
         if ($this->parent && $this->parent->getOption('prefix')) {
-            $prefix = $this->parent->getOption('prefix') . $prefix;
+            $prefix = $this->parent->getOption('prefix').$prefix;
         }
 
         return $this->setOption('prefix', $prefix);

src/think/route/Resource.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\route;
 
@@ -109,10 +109,10 @@ 
             $item  = [];
 
             foreach ($array as $val) {
-                $item[] = $val . '/<' . ($option['var'][$val] ?? $val . '_id') . '>';
+                $item[] = $val.'/<'.($option['var'][$val] ?? $val.'_id').'>';
             }
 
-            $rule = implode('/', $item) . '/' . $last;
+            $rule = implode('/', $item).'/'.$last;
         }
 
         $prefix = substr($rule, strlen($this->name) + 1);
@@ -125,12 +125,12 @@ 
             }
 
             if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$last].'>', $val[1]);
             } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$rule].'>', $val[1]);
             }
 
-            $ruleItem = $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+            $ruleItem = $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]);
 
             foreach (['model', 'validate', 'middleware'] as $name) {
                 if (isset($this->$name[$key])) {

src/think/Console.php

Spacing +11 added lines, -11 removed lines

@@ -6,7 +6,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -264,7 +264,7 @@ 
 
         $command = $this->find($name);
 
-        $this->app->log->info('run: php think ' . $input);
+        $this->app->log->info('run: php think '.$input);
 
         return $this->doRunCommand($command, $input, $output);
     }
@@ -469,10 +469,10 @@ 
     public function findNamespace(string $namespace): string
     {
         $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);
@@ -509,13 +509,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));
             }
@@ -709,7 +709,7 @@ 
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
             return $lev < 2 * $threshold;
         });
         asort($alternatives);
@@ -730,7 +730,7 @@ 
 
         foreach ($parts as $part) {
             if (count($namespaces)) {
-                $namespaces[] = end($namespaces) . ':' . $part;
+                $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
             }

src/think/view/driver/Php.php

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\view\driver;
 
@@ -77,14 +77,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $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);
 
@@ -103,7 +103,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -115,7 +115,7 @@ 
     private function parseTemplate(string $template): string
     {
         if (empty($this->config['view_base'])) {
-            $this->config['view_base'] = $this->app->getRootPath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_base'] = $this->app->getRootPath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $request = $this->app->request;
@@ -131,7 +131,7 @@ 
         } else {
             $app = isset($app) ? $app : $request->app();
             // 基础视图目录
-            $path = $this->config['view_base'] . ($app ? $app . DIRECTORY_SEPARATOR : '');
+            $path = $this->config['view_base'].($app ? $app.DIRECTORY_SEPARATOR : '');
         }
 
         $depr = $this->config['view_depr'];
@@ -151,16 +151,16 @@ 
                         $template = App::parseName($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'], '.');
     }
 
     /**

src/think/App.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -155,13 +155,13 @@ 
      */
     public function __construct(string $rootPath = '')
     {
-        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
-        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
-        $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
+        $this->thinkPath   = dirname(__DIR__).DIRECTORY_SEPARATOR;
+        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
+        $this->appPath     = $this->rootPath.'app'.DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
 
-        if (is_file($this->appPath . 'provider.php')) {
-            $this->bind(include $this->appPath . 'provider.php');
+        if (is_file($this->appPath.'provider.php')) {
+            $this->bind(include $this->appPath.'provider.php');
         }
 
         static::setInstance($this);
@@ -221,7 +221,7 @@ 
     public function getService($service)
     {
         $name = is_string($service) ? $service : get_class($service);
-        return array_values(array_filter($this->services, function ($value) use ($name) {
+        return array_values(array_filter($this->services, function($value) use ($name) {
             return $value instanceof $name;
         }, ARRAY_FILTER_USE_BOTH))[0] ?? null;
     }
@@ -297,7 +297,7 @@ 
      */
     public function getBasePath(): string
     {
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -355,7 +355,7 @@ 
      */
     public function getConfigPath(): string
     {
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -401,8 +401,8 @@ 
         $this->beginMem  = memory_get_usage();
 
         // 加载环境变量
-        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');
@@ -415,7 +415,7 @@ 
         // 加载框架默认语言包
         $langSet = $this->lang->defaultLangSet();
 
-        $this->lang->load($this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $langSet . '.php');
+        $this->lang->load($this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$langSet.'.php');
 
         // 加载应用默认语言包
         $this->loadLangPack($langSet);
@@ -454,7 +454,7 @@ 
         }
 
         // 加载系统语言包
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
         $this->lang->load($files);
 
         // 加载扩展（自定义）语言包
@@ -472,7 +472,7 @@ 
      */
     public function boot(): void
     {
-        array_walk($this->services, function ($service) {
+        array_walk($this->services, function($service) {
             $this->bootService($service);
         });
     }
@@ -486,30 +486,30 @@ 
     {
         $appPath = $this->getAppPath();
 
-        if (is_file($appPath . 'common.php')) {
-            include_once $appPath . 'common.php';
+        if (is_file($appPath.'common.php')) {
+            include_once $appPath.'common.php';
         }
 
-        include_once $this->thinkPath . 'helper.php';
+        include_once $this->thinkPath.'helper.php';
 
         $configPath = $this->getConfigPath();
 
         $files = [];
 
         if (is_dir($configPath)) {
-            $files = glob($configPath . '*' . $this->configExt);
+            $files = glob($configPath.'*'.$this->configExt);
         }
 
         foreach ($files as $file) {
             $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
         }
 
-        if (is_file($appPath . 'event.php')) {
-            $this->loadEvent(include $appPath . 'event.php');
+        if (is_file($appPath.'event.php')) {
+            $this->loadEvent(include $appPath.'event.php');
         }
 
-        if (is_file($appPath . 'service.php')) {
-            $services = include $appPath . 'service.php';
+        if (is_file($appPath.'service.php')) {
+            $services = include $appPath.'service.php';
             foreach ($services as $service) {
                 $this->register($service);
             }
@@ -574,9 +574,9 @@ 
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
         $class = self::parseName(array_pop($array), 1);
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.$layer.'\\'.$path.$class;
     }
 
     /**
@@ -597,7 +597,7 @@ 
     {
         $path = dirname(dirname(dirname(dirname($this->thinkPath))));
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
     /**