top-think / framework

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/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 : $this->app->http->getName();
             $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'], '.');
     }
 
     /**

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/Clear.php

Spacing +9 added lines, -9 removed lines

@@ -35,18 +35,18 @@ 
         if ($input->getOption('route')) {
             $this->app->cache->clear('route_cache');
         } else {
-            $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>");
@@ -57,13 +57,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);
             }
         }
     }

src/think/console/command/Build.php

Spacing +23 added lines, -23 removed lines

@@ -40,7 +40,7 @@ 
         $this->basePath = $this->app->getBasePath();
         $dir            = $input->getArgument('dir') ?: '';
 
-        $list = include $this->basePath . 'build.php';
+        $list = include $this->basePath.'build.php';
 
         if (empty($list)) {
             $output->writeln("Build file Is Empty");
@@ -61,13 +61,13 @@ 
      */
     protected function buildApp(string $dir, array $list = []): void
     {
-        if (!is_dir($this->basePath . $dir)) {
+        if (!is_dir($this->basePath.$dir)) {
             // 创建应用目录
-            mkdir($this->basePath . $dir);
+            mkdir($this->basePath.$dir);
         }
 
-        $appPath   = $this->basePath . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
-        $namespace = 'app' . ($dir ? '\\' . $dir : '');
+        $appPath   = $this->basePath.($dir ? $dir.DIRECTORY_SEPARATOR : '');
+        $namespace = 'app'.($dir ? '\\'.$dir : '');
 
         // 创建配置文件和公共文件
         $this->buildCommon($dir);
@@ -78,41 +78,41 @@ 
             if ('__dir__' == $path) {
                 // 生成子目录
                 foreach ($file as $dir) {
-                    $this->checkDirBuild($appPath . $dir);
+                    $this->checkDirBuild($appPath.$dir);
                 }
             } elseif ('__file__' == $path) {
                 // 生成（空白）文件
                 foreach ($file as $name) {
-                    if (!is_file($appPath . $name)) {
-                        file_put_contents($appPath . $name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? '<?php' . PHP_EOL : '');
+                    if (!is_file($appPath.$name)) {
+                        file_put_contents($appPath.$name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? '<?php'.PHP_EOL : '');
                     }
                 }
             } else {
                 // 生成相关MVC文件
                 foreach ($file as $val) {
                     $val      = trim($val);
-                    $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . '.php';
-                    $space    = $namespace . '\\' . $path;
+                    $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'.php';
+                    $space    = $namespace.'\\'.$path;
                     $class    = $val;
                     switch ($path) {
                         case 'controller': // 控制器
                             if ($this->app->config->get('route.controller_suffix')) {
-                                $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . 'Controller.php';
-                                $class    = $val . 'Controller';
+                                $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'Controller.php';
+                                $class    = $val.'Controller';
                             }
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "class {$class}" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."class {$class}".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                             break;
                         case 'model': // 模型
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "use think\Model;" . PHP_EOL . PHP_EOL . "class {$class} extends Model" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."use think\Model;".PHP_EOL.PHP_EOL."class {$class} extends Model".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                             break;
                         case 'view': // 视图
-                            $filename = $appPath . $path . DIRECTORY_SEPARATOR . $val . '.html';
+                            $filename = $appPath.$path.DIRECTORY_SEPARATOR.$val.'.html';
                             $this->checkDirBuild(dirname($filename));
                             $content = '';
                             break;
                         default:
                             // 其他文件
-                            $content = "<?php" . PHP_EOL . "namespace {$space};" . PHP_EOL . PHP_EOL . "class {$class}" . PHP_EOL . "{" . PHP_EOL . PHP_EOL . "}";
+                            $content = "<?php".PHP_EOL."namespace {$space};".PHP_EOL.PHP_EOL."class {$class}".PHP_EOL."{".PHP_EOL.PHP_EOL."}";
                     }
 
                     if (!is_file($filename)) {
@@ -133,10 +133,10 @@ 
     protected function buildHello(string $dir, string $namespace): void
     {
         $suffix   = $this->app->config->get('route.controller_suffix') ? 'Controller' : '';
-        $filename = $this->basePath . ($dir ? $dir . DIRECTORY_SEPARATOR : '') . 'controller' . DIRECTORY_SEPARATOR . 'Index' . $suffix . '.php';
+        $filename = $this->basePath.($dir ? $dir.DIRECTORY_SEPARATOR : '').'controller'.DIRECTORY_SEPARATOR.'Index'.$suffix.'.php';
 
         if (!is_file($filename)) {
-            $content = file_get_contents($this->app->getThinkPath() . 'tpl' . DIRECTORY_SEPARATOR . 'default_index.tpl');
+            $content = file_get_contents($this->app->getThinkPath().'tpl'.DIRECTORY_SEPARATOR.'default_index.tpl');
             $content = str_replace(['{%name%}', '{%app%}', '{%layer%}', '{%suffix%}'], [$dir, $namespace, 'controller', $suffix], $content);
             $this->checkDirBuild(dirname($filename));
 
@@ -152,15 +152,15 @@ 
      */
     protected function buildCommon(string $dir): void
     {
-        $appPath = $this->basePath . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $appPath = $this->basePath.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
-        if (!is_file($appPath . 'common.php')) {
-            file_put_contents($appPath . 'common.php', "<?php" . PHP_EOL . "// 这是系统自动生成的公共文件" . PHP_EOL);
+        if (!is_file($appPath.'common.php')) {
+            file_put_contents($appPath.'common.php', "<?php".PHP_EOL."// 这是系统自动生成的公共文件".PHP_EOL);
         }
 
         foreach (['event', 'middleware', 'provider'] as $name) {
-            if (!is_file($appPath . $name . '.php')) {
-                file_put_contents($appPath . $name . '.php', "<?php" . PHP_EOL . "// 这是系统自动生成的{$name}定义文件" . PHP_EOL . "return [" . PHP_EOL . PHP_EOL . "];" . PHP_EOL);
+            if (!is_file($appPath.$name.'.php')) {
+                file_put_contents($appPath.$name.'.php', "<?php".PHP_EOL."// 这是系统自动生成的{$name}定义文件".PHP_EOL."return [".PHP_EOL.PHP_EOL."];".PHP_EOL);
             }
         }
     }

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

Spacing +6 added lines, -6 removed lines

@@ -29,9 +29,9 @@ 
     {
         $dir = $input->getArgument('dir') ?: '';
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -46,21 +46,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($dir ? $dir.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 .= '\Opis\Closure\unserialize(\'' . \Opis\Closure\serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\Opis\Closure\unserialize(\''.\Opis\Closure\serialize($this->app->route->getName()).'\');';
         return $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/route/Url.php

Spacing +19 added lines, -19 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -190,7 +190,7 @@ 
                 }
             }
         } elseif (false === strpos($domain, '.') && 0 !== strpos($domain, $rootDomain)) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -199,7 +199,7 @@ 
             $scheme = $this->https || $request->isSsl() ? 'https://' : 'http://';
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     /**
@@ -218,7 +218,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.'.$suffix;
     }
 
     /**
@@ -248,7 +248,7 @@ 
             $action     = array_pop($path);
             $controller = empty($path) ? $controller : array_pop($path);
 
-            $url = $controller . '/' . $action;
+            $url = $controller.'/'.$action;
         }
 
         return $url;
@@ -295,7 +295,7 @@ 
     {
         $request = $this->app->request;
         if (is_string($allowDomain) && false === strpos($allowDomain, '.')) {
-            $allowDomain .= '.' . $request->rootDomain();
+            $allowDomain .= '.'.$request->rootDomain();
         }
 
         foreach ($rule as $item) {
@@ -313,7 +313,7 @@ 
             }
 
             if (!in_array($request->port(), [80, 443])) {
-                $domain .= ':' . $request->port();
+                $domain .= ':'.$request->port();
             }
 
             if (empty($pattern)) {
@@ -324,12 +324,12 @@ 
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
+                    $url = str_replace(['[:'.$key.']', '<'.$key.'?>', ':'.$key, '<'.$key.'>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
                     unset($vars[$key]);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
-                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/[:'.$key.']', '[:'.$key.']', '<'.$key.'?>'], '', $url);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {
@@ -357,7 +357,7 @@ 
         if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
             // [name] 表示使用路由命名标识生成URL
             $name = substr($url, 1, $pos - 1);
-            $url  = 'name' . substr($url, $pos + 1);
+            $url  = 'name'.substr($url, $pos + 1);
         }
 
         if (false === strpos($url, '://') && 0 !== strpos($url, '/')) {
@@ -384,7 +384,7 @@ 
         }
 
         if ($url) {
-            $checkName   = isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '');
+            $checkName   = isset($name) ? $name : $url.(isset($info['query']) ? '?'.$info['query'] : '');
             $checkDomain = $domain && is_string($domain) ? $domain : null;
 
             $rule = $this->route->getName($checkName, $checkDomain);
@@ -410,7 +410,7 @@ 
                 $suffix = $match[2];
             }
         } elseif (!empty($rule) && isset($name)) {
-            throw new \InvalidArgumentException('route name not exists:' . $name);
+            throw new \InvalidArgumentException('route name not exists:'.$name);
         } else {
             // 检测URL绑定
             $bind = $this->route->getDomainBind($domain && is_string($domain) ? $domain : null);
@@ -448,7 +448,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -458,32 +458,32 @@ 
         }
 
         // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
+        $anchor = !empty($anchor) ? '#'.$anchor : '';
 
         // 参数组装
         if (!empty($vars)) {
             // 添加参数
             if ($this->route->config('url_common_param')) {
                 $vars = http_build_query($vars);
-                $url .= $suffix . '?' . $vars . $anchor;
+                $url .= $suffix.'?'.$vars.$anchor;
             } else {
                 foreach ($vars as $var => $val) {
                     if ('' !== $val) {
-                        $url .= $depr . $var . $depr . urlencode((string) $val);
+                        $url .= $depr.$var.$depr.urlencode((string) $val);
                     }
                 }
 
-                $url .= $suffix . $anchor;
+                $url .= $suffix.$anchor;
             }
         } else {
-            $url .= $suffix . $anchor;
+            $url .= $suffix.$anchor;
         }
 
         // 检测域名
         $domain = $this->parseDomain($url, $domain);
 
         // URL组装
-        return $domain . rtrim($this->root, '/') . '/' . ltrim($url, '/');
+        return $domain.rtrim($this->root, '/').'/'.ltrim($url, '/');
     }
 
     public function __toString()