top-think / framework

src/think/db/concern/ParamsBind.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 
@@ -47,7 +47,7 @@ 
      */
     public function bindValue($value, int $type = null, string $name = null)
     {
-        $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
+        $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_';
 
         $this->bind[$name] = [$value, $type ?: PDO::PARAM_STR];
         return $name;
@@ -81,9 +81,9 @@ 
             }
 
             if (is_numeric($key)) {
-                $sql = substr_replace($sql, ':' . $name, strpos($sql, '?'), 1);
+                $sql = substr_replace($sql, ':'.$name, strpos($sql, '?'), 1);
             } else {
-                $sql = str_replace(':' . $key, ':' . $name, $sql);
+                $sql = str_replace(':'.$key, ':'.$name, $sql);
             }
         }
     }

src/think/db/concern/WhereQuery.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 
@@ -52,7 +52,7 @@ 
             foreach ($this->options['where'] as $logic => &$where) {
                 foreach ($where as $key => &$val) {
                     if (is_array($val) && !strpos($val[0], '.')) {
-                        $val[0] = $via . '.' . $val[0];
+                        $val[0] = $via.'.'.$val[0];
                     }
                 }
             }
@@ -362,7 +362,7 @@ 
         $logic = strtoupper($logic);
 
         if (is_string($field) && !empty($this->options['via']) && false === strpos($field, '.')) {
-            $field = $this->options['via'] . '.' . $field;
+            $field = $this->options['via'].'.'.$field;
         }
 
         if ($field instanceof Raw) {

src/think/db/concern/TimeFieldQuery.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 
@@ -61,7 +61,7 @@ 
             $op    = 'between';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -77,7 +77,7 @@ 
     public function whereTimeInterval(string $field, string $start, string $interval = 'day', int $step = 1, string $logic = 'AND')
     {
         $startTime = strtotime($start);
-        $endTime   = strtotime(($step > 0 ? '+' : '-') . abs($step) . ' ' . $interval . (abs($step) > 1 ? 's' : ''), $startTime);
+        $endTime   = strtotime(($step > 0 ? '+' : '-').abs($step).' '.$interval.(abs($step) > 1 ? 's' : ''), $startTime);
 
         return $this->whereTime($field, 'between', $step > 0 ? [$startTime, $endTime] : [$endTime, $startTime], $logic);
     }
@@ -133,7 +133,7 @@ 
             $year = date('Y', strtotime($year));
         }
 
-        return $this->whereTimeInterval($field, $year . '-1-1', 'year', $step, $logic);
+        return $this->whereTimeInterval($field, $year.'-1-1', 'year', $step, $logic);
     }
 
     /**

src/think/db/concern/AggregateQuery.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\db\concern;
 
@@ -42,7 +42,7 @@ 
             // 支持GROUP
             $options = $this->getOptions();
             $subSql  = $this->options($options)
-                ->field('count(' . $field . ') AS think_count')
+                ->field('count('.$field.') AS think_count')
                 ->bind($this->bind)
                 ->buildSql();
 

src/think/db/concern/TableFieldInfo.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 

src/think/db/concern/PDOQuery.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\concern;
 

src/think/console/command/RouteBuild.php

Spacing +23 added lines, -23 removed lines

@@ -30,7 +30,7 @@ 
     {
         $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;
         }
@@ -47,21 +47,21 @@ 
     protected function buildRoute(string $app = null): string
     {
         if ($app) {
-            $path      = $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR;
-            $namespace = 'app\\' . $app;
+            $path      = $this->app->getBasePath().$app.DIRECTORY_SEPARATOR;
+            $namespace = 'app\\'.$app;
         } else {
             $path      = $this->app->getBasePath();
             $namespace = 'app';
         }
 
-        $content = '<?php ' . PHP_EOL . '// 根据注解自动生成的路由规则' . PHP_EOL . 'use think\\facade\\Route;' . PHP_EOL;
+        $content = '<?php '.PHP_EOL.'// 根据注解自动生成的路由规则'.PHP_EOL.'use think\\facade\\Route;'.PHP_EOL;
 
         $layer  = $this->app->config->get('route.controller_layer');
         $suffix = $this->app->config->get('route.controller_suffix');
 
-        $content .= $this->buildDirRoute($path . $layer . DIRECTORY_SEPARATOR, $namespace, $suffix, $layer);
+        $content .= $this->buildDirRoute($path.$layer.DIRECTORY_SEPARATOR, $namespace, $suffix, $layer);
 
-        $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '') . 'build_route.php';
+        $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '').'build_route.php';
 
         if (!file_exists($filename)) {
             touch($filename);
@@ -89,7 +89,7 @@ 
     protected function buildDirRoute(string $path, string $namespace, bool $suffix, string $layer): string
     {
         $content     = '';
-        $controllers = glob($path . '*.php');
+        $controllers = glob($path.'*.php');
 
         foreach ($controllers as $controller) {
             $controller = basename($controller, '.php');
@@ -99,21 +99,21 @@ 
                 $controller = substr($controller, 0, -10);
             }
 
-            $class = new \ReflectionClass($namespace . '\\' . $layer . '\\' . $controller);
+            $class = new \ReflectionClass($namespace.'\\'.$layer.'\\'.$controller);
 
             if (strpos($layer, '\\')) {
                 // 多级控制器
                 $level      = str_replace(DIRECTORY_SEPARATOR, '.', substr($layer, 11));
-                $controller = $level . '.' . $controller;
+                $controller = $level.'.'.$controller;
             }
 
             $content .= $this->getControllerRoute($class, $controller);
         }
 
-        $subDir = glob($path . '*', GLOB_ONLYDIR);
+        $subDir = glob($path.'*', GLOB_ONLYDIR);
 
         foreach ($subDir as $dir) {
-            $content .= $this->buildDirRoute($dir . DIRECTORY_SEPARATOR, $namespace, $suffix, $layer . '\\' . basename($dir));
+            $content .= $this->buildDirRoute($dir.DIRECTORY_SEPARATOR, $namespace, $suffix, $layer.'\\'.basename($dir));
         }
 
         return $content;
@@ -133,12 +133,12 @@ 
 
         if (false !== strpos($comment, '@route(')) {
             $comment = $this->parseRouteComment($comment);
-            $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $controller . '\')', $comment);
-            $content .= PHP_EOL . $comment;
+            $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\''.$controller.'\')', $comment);
+            $content .= PHP_EOL.$comment;
         } elseif (false !== strpos($comment, '@group(')) {
             $comment = $this->parseRouteComment($comment, '@group(');
             $comment = preg_replace('/group\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::group(\1)', $comment);
-            $content .= PHP_EOL . $comment;
+            $content .= PHP_EOL.$comment;
             preg_match('/group\(\s?[\'\"]([\-\_\/\w]+)[\'\"]\s?\)/is', $comment, $matches);
             $group = $matches[1];
         }
@@ -148,7 +148,7 @@ 
         foreach ($methods as $method) {
             $comment = $this->getMethodRouteComment($controller, $method, $group ?? null);
             if ($comment) {
-                $content .= PHP_EOL . $comment;
+                $content .= PHP_EOL.$comment;
             }
         }
 
@@ -166,7 +166,7 @@ 
     {
         $comment = substr($comment, 3, -2);
         $comment = explode(PHP_EOL, substr(strstr(trim($comment), $tag), 1));
-        $comment = array_map(function ($item) {
+        $comment = array_map(function($item) {
             return trim(trim($item), ' \t*');
         }, $comment);
 
@@ -175,11 +175,11 @@ 
             $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;
@@ -200,15 +200,15 @@ 
         if (false !== strpos($comment, '@route(')) {
             $comment = $this->parseRouteComment($comment);
             $action  = $reflectMethod->getName();
-            $group   = $group ? '->group(\'' . $group . '\')' : '';
+            $group   = $group ? '->group(\''.$group.'\')' : '';
 
             if ($suffix = $this->app->route->config('action_suffix')) {
                 $action = substr($action, 0, -strlen($suffix));
             }
 
-            $route   = $controller . '/' . $action;
-            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')' . $group, $comment);
-            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')' . $group, $comment);
+            $route   = $controller.'/'.$action;
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\''.$route.'\')'.$group, $comment);
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\''.$route.'\')'.$group, $comment);
 
             return $comment;
         }

src/think/Route.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;
 
@@ -175,9 +175,9 @@ 
             $this->cache = $this->app->cache->store(true === $this->config['route_check_cache'] ? '' : $this->config['route_check_cache']);
         }
 
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
+        if (is_file($this->app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
+            $this->import(include $this->app->getRuntimePath().'route.php');
         }
     }
 
@@ -390,13 +390,13 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } 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])) {
@@ -727,7 +727,7 @@ 
         $this->init();
 
         if ($withRoute) {
-            $checkCallback = function () use ($request, $withRoute) {
+            $checkCallback = function() use ($request, $withRoute) {
                 //加载路由
                 $withRoute();
                 return $this->check();
@@ -746,7 +746,7 @@ 
 
         $dispatch->init($this->app);
 
-        $this->app->middleware->add(function () use ($dispatch) {
+        $this->app->middleware->add(function() use ($dispatch) {
             try {
                 $response = $dispatch->run();
             } catch (HttpResponseException $exception) {
@@ -770,7 +770,7 @@ 
             $closure  = $this->config['route_check_cache_key'];
             $routeKey = $closure($request);
         } else {
-            $routeKey = md5($request->baseUrl(true) . ':' . $request->method());
+            $routeKey = md5($request->baseUrl(true).':'.$request->method());
         }
 
         return $routeKey;
@@ -820,10 +820,10 @@ 
             $path = $pathinfo;
         } elseif ($suffix) {
             // 去除正常的URL后缀
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
         } else {
             // 允许任何后缀访问
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
         }
 
         return $path;
@@ -866,9 +866,9 @@ 
                 $item = $this->domains[$this->host];
             } elseif (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)) {
                 // 泛二级域名

src/think/route/RuleItem.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\route;
 
@@ -134,7 +134,7 @@ 
         $rule = '/' != $rule ? ltrim($rule, '/') : '';
 
         if ($this->parent && $prefix = $this->parent->getFullName()) {
-            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+            $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : '');
         }
 
         if (false !== strpos($rule, ':')) {
@@ -237,7 +237,7 @@ 
 
         if (isset($option['ext'])) {
             // 路由ext参数 优先于系统配置的URL伪静态后缀参数
-            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+            $url = preg_replace('/\.('.$request->ext().')$/i', '', $url);
         }
 
         return $url;
@@ -261,38 +261,38 @@ 
         $pattern = array_merge($this->parent->getPattern(), $this->pattern);
 
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) {
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].($completeMatch ? '$' : '').'/', str_replace('|', $depr, $url))) {
             return false;
         }
 
         $var  = [];
-        $url  = $depr . str_replace('|', $depr, $url);
-        $rule = $depr . str_replace('/', $depr, $this->rule);
+        $url  = $depr.str_replace('|', $depr, $url);
+        $rule = $depr.str_replace('/', $depr, $this->rule);
 
         if ($depr == $rule && $depr != $url) {
             return false;
         }
 
         if (false === strpos($rule, '<')) {
-            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) {
                 return $var;
             }
             return false;
         }
 
-        $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]))) {
                 return false;
             }
         }
 
-        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+        if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
             $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
 
             try {
-                if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/u', $url, $match)) {
+                if (!preg_match('/^'.$regex.($completeMatch ? '$' : '').'/u', $url, $match)) {
                     return false;
                 }
             } catch (\Exception $e) {