top-think / framework

src/think/route/Url.php

Spacing +18 added lines, -18 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;
     }
 
     /**
@@ -287,7 +287,7 @@ 
     {
         $request = $this->app->request;
         if (is_string($allowDomain) && false === strpos($allowDomain, '.')) {
-            $allowDomain .= '.' . $request->rootDomain();
+            $allowDomain .= '.'.$request->rootDomain();
         }
 
         foreach ($rule as $item) {
@@ -305,7 +305,7 @@ 
             }
 
             if (!in_array($request->port(), [80, 443])) {
-                $domain .= ':' . $request->port();
+                $domain .= ':'.$request->port();
             }
 
             if (empty($pattern)) {
@@ -316,12 +316,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 {
@@ -349,7 +349,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, '/')) {
@@ -376,7 +376,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);
@@ -402,7 +402,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);
@@ -440,7 +440,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -450,32 +450,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()

src/think/console/Command.php

Spacing +2 added lines, -2 removed lines

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

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

Spacing +6 added lines, -6 removed lines

@@ -29,9 +29,9 @@ 
     {
         $dir = $input->getOption('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 +7 added lines, -7 removed lines

@@ -43,9 +43,9 @@ 
         $dir = $input->getOption('dir');
 
         if ($dir) {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . 'route_list.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.'route_list.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)) {
@@ -55,7 +55,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
@@ -64,16 +64,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;
             }
         }
 
@@ -112,7 +112,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;