top-think / framework

src/think/route/Rule.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;
 
@@ -602,7 +602,7 @@ 
     {
         if (is_string($route) && isset($option['prefix'])) {
             // 路由地址前缀
-            $route = $option['prefix'] . $route;
+            $route = $option['prefix'].$route;
         }
 
         // 替换路由地址中的变量
@@ -610,10 +610,10 @@ 
             $search = $replace = [];
 
             foreach ($matches as $key => $value) {
-                $search[]  = '<' . $key . '>';
+                $search[]  = '<'.$key.'>';
                 $replace[] = $value;
 
-                $search[]  = ':' . $key;
+                $search[]  = ':'.$key;
                 $replace[] = $value;
             }
 
@@ -718,7 +718,7 @@ 
         // AJAX PJAX 请求检查
         foreach (['ajax', 'pjax', 'json'] as $item) {
             if (isset($option[$item])) {
-                $call = 'is' . $item;
+                $call = 'is'.$item;
                 if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
                     return false;
                 }
@@ -726,8 +726,8 @@ 
         }
 
         // 伪静态后缀检测
-        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|' . $option['ext'] . '|', '|' . $request->ext() . '|'))
-            || (isset($option['deny_ext']) && false !== stripos('|' . $option['deny_ext'] . '|', '|' . $request->ext() . '|')))) {
+        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|'.$option['ext'].'|', '|'.$request->ext().'|'))
+            || (isset($option['deny_ext']) && false !== stripos('|'.$option['deny_ext'].'|', '|'.$request->ext().'|')))) {
             return false;
         }
 
@@ -764,7 +764,7 @@ 
     protected function parseUrlParams(string $url, array &$var = []): void
     {
         if ($url) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, $url);
         }
@@ -826,7 +826,7 @@ 
             $regex .= '\/';
         }
 
-        return $regex . ($completeMatch ? '$' : '');
+        return $regex.($completeMatch ? '$' : '');
     }
 
     /**
@@ -843,7 +843,7 @@ 
         $slash    = substr($name, 0, 1);
 
         if (in_array($slash, ['/', '-'])) {
-            $prefix = '\\' . $slash;
+            $prefix = '\\'.$slash;
             $name   = substr($name, 1);
             $slash  = substr($name, 0, 1);
         } else {
@@ -851,7 +851,7 @@ 
         }
 
         if ('<' != $slash) {
-            return $prefix . preg_quote($name, '/');
+            return $prefix.preg_quote($name, '/');
         }
 
         if (strpos($name, '?')) {
@@ -870,7 +870,7 @@ 
             $nameRule = $this->router->config('default_route_pattern');
         }
 
-        return '(' . $prefix . '(?<' . $name . $suffix . '>' . $nameRule . '))' . $optional;
+        return '('.$prefix.'(?<'.$name.$suffix.'>'.$nameRule.'))'.$optional;
     }
 
     /**

src/think/route/RuleName.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -132,7 +132,7 @@ 
                 $val = [];
 
                 foreach (['method', 'rule', 'name', 'route', 'domain', 'pattern', 'option'] as $param) {
-                    $call        = 'get' . $param;
+                    $call        = 'get'.$param;
                     $val[$param] = $item->$call();
                 }
 

src/think/route/Url.php

Spacing +21 added lines, -21 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -172,7 +172,7 @@ 
                 }
             }
         } elseif (false === strpos($domain, '.') && 0 !== strpos($domain, $rootDomain)) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -181,7 +181,7 @@ 
             $scheme = $request->isSsl() ? 'https://' : 'http://';
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     /**
@@ -200,7 +200,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.'.$suffix;
     }
 
     /**
@@ -242,7 +242,7 @@ 
                 $controller = App::parseName($controller);
             }
 
-            $url = $controller . '/' . $action;
+            $url = $controller.'/'.$action;
 
             if ($app && $this->app->config->get('app.auto_multi_app')) {
                 $bind = $this->app->config->get('app.domain_bind', []);
@@ -252,9 +252,9 @@ 
                     $map = $this->app->config->get('app.app_map', []);
 
                     if ($key = array_search($app, $map)) {
-                        $url = $key . '/' . $url;
+                        $url = $key.'/'.$url;
                     } else {
-                        $url = $app . '/' . $url;
+                        $url = $app.'/'.$url;
                     }
                 }
             }
@@ -319,7 +319,7 @@ 
             }
 
             if (!in_array($request->port(), [80, 443])) {
-                $domain .= ':' . $request->port();
+                $domain .= ':'.$request->port();
             }
 
             if (empty($pattern)) {
@@ -330,12 +330,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 {
@@ -363,7 +363,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, '/')) {
@@ -390,7 +390,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);
@@ -417,10 +417,10 @@ 
             }
 
             if ($request->app() && $this->app->config->get('app.auto_multi_app') && !$this->app->http->isBindDomain()) {
-                $url = $request->app() . '/' . $url;
+                $url = $request->app().'/'.$url;
             }
         } 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);
@@ -458,7 +458,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -468,32 +468,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/route/dispatch/Url.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\dispatch;
 
@@ -47,7 +47,7 @@ 
         if ($bind && preg_match('/^[a-z]/is', $bind)) {
             $bind = str_replace('/', $depr, $bind);
             // 如果有模块/控制器绑定
-            $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr);
+            $url = $bind.('.' != substr($bind, -1) ? $depr : '').ltrim($url, $depr);
         }
 
         $path = $this->rule->parseUrlPath($url);
@@ -59,7 +59,7 @@ 
         $controller = !empty($path) ? array_shift($path) : null;
 
         if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
+            throw new HttpException(404, 'controller not exists:'.$controller);
         }
 
         // 解析操作
@@ -68,7 +68,7 @@ 
 
         // 解析额外参数
         if ($path) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, implode('|', $path));
         }
@@ -86,7 +86,7 @@ 
         $route = [$controller, $action];
 
         if ($this->hasDefinedRoute($route)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -103,7 +103,7 @@ 
         list($controller, $action) = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower(App::parseName($controller, 1) . '/' . $action);
+        $name = strtolower(App::parseName($controller, 1).'/'.$action);
 
         $host   = $this->request->host(true);
         $method = $this->request->method();

src/think/service/PaginatorService.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\service;
 
@@ -30,15 +30,15 @@ 
 
     public function boot()
     {
-        Paginator::maker(function (...$args) {
+        Paginator::maker(function(...$args) {
             return $this->app->make(Paginator::class, $args, true);
         });
 
-        Paginator::currentPathResolver(function () {
+        Paginator::currentPathResolver(function() {
             return $this->app->request->baseUrl();
         });
 
-        Paginator::currentPageResolver(function ($varPage = 'page') {
+        Paginator::currentPageResolver(function($varPage = 'page') {
 
             $page = $this->app->request->param($varPage);
 

src/think/service/ValidateService.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\service;
 
@@ -22,7 +22,7 @@ 
 {
     public function boot()
     {
-        Validate::maker(function (Validate $validate) {
+        Validate::maker(function(Validate $validate) {
             $validate->setLang($this->app->lang);
             $validate->setDb($this->app->db);
             $validate->setRequest($this->app->request);

src/think/service/ModelService.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\service;
 
@@ -22,7 +22,7 @@ 
 {
     public function boot()
     {
-        Model::maker(function (Model $model) {
+        Model::maker(function(Model $model) {
             $db     = $this->app->db;
             $config = $this->app->config;
             $model->setDb($db);

src/think/console/output/driver/Console.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,7 @@ 
             proc_close($process);
 
             if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return $matches[2] . 'x' . $matches[1];
+                return $matches[2].'x'.$matches[1];
             }
         }
         return;
@@ -264,7 +264,7 @@ 
         $lines      = [];
         $line       = '';
         foreach (preg_split('//u', $utf8String) as $char) {
-            if (mb_strwidth($line . $char, 'utf8') <= $width) {
+            if (mb_strwidth($line.$char, 'utf8') <= $width) {
                 $line .= $char;
                 continue;
             }
@@ -340,7 +340,7 @@ 
         if (null === $stream) {
             $stream = $this->stdout;
         }
-        if (false === @fwrite($stream, $message . ($newline ? PHP_EOL : ''))) {
+        if (false === @fwrite($stream, $message.($newline ? PHP_EOL : ''))) {
             throw new \RuntimeException('Unable to write output.');
         }
 
@@ -356,7 +356,7 @@ 
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             return
-            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
+            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
             || false !== getenv('ANSICON')
             || 'ON' === getenv('ConEmuANSI')
             || 'xterm' === getenv('TERM');

src/think/console/output/Descriptor.php

Spacing +7 added lines, -7 removed lines

@@ -86,7 +86,7 @@ 
         $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s", $argument->getName(), str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', PHP_EOL . str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
+            preg_replace('/\s*\R\s*/', PHP_EOL.str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
     }
 
     /**
@@ -108,10 +108,10 @@ 
 
         $value = '';
         if ($option->acceptValue()) {
-            $value = '=' . strtoupper($option->getName());
+            $value = '='.strtoupper($option->getName());
 
             if ($option->isValueOptional()) {
-                $value = '[' . $value . ']';
+                $value = '['.$value.']';
             }
         }
 
@@ -121,7 +121,7 @@ 
         $spacingWidth = $totalWidth - strlen($synopsis) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s%s", $synopsis, str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', "\n" . str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
+            preg_replace('/\s*\R\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
     }
 
     /**
@@ -184,7 +184,7 @@ 
         $this->writeText('<comment>Usage:</comment>', $options);
         foreach (array_merge([$command->getSynopsis(true)], $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
-            $this->writeText('  ' . $usage, $options);
+            $this->writeText('  '.$usage, $options);
         }
         $this->writeText("\n");
 
@@ -199,7 +199,7 @@ 
             $this->writeText("\n");
             $this->writeText('<comment>Help:</comment>', $options);
             $this->writeText("\n");
-            $this->writeText(' ' . str_replace("\n", "\n ", $help), $options);
+            $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
             $this->writeText("\n");
         }
     }
@@ -247,7 +247,7 @@ 
             foreach ($description->getNamespaces() as $namespace) {
                 if (!$describedNamespace && ConsoleDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
                     $this->writeText("\n");
-                    $this->writeText(' <comment>' . $namespace['id'] . '</comment>', $options);
+                    $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options);
                 }
 
                 foreach ($namespace['commands'] as $name) {