top-think / framework

library/think/Url.php

Spacing +22 added lines, -22 removed lines

@@ -42,9 +42,9 @@ 
         $this->app    = $app;
         $this->config = $config;
 
-        if (is_file($app->getRuntimePath() . 'route.php')) {
+        if (is_file($app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $app['route']->setName(include $app->getRuntimePath() . 'route.php');
+            $app['route']->setName(include $app->getRuntimePath().'route.php');
         }
     }
 
@@ -79,7 +79,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, '/')) {
@@ -112,7 +112,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->app['route']->getName($checkName, $checkDomain);
@@ -138,7 +138,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 {
             // 检查别名路由
             $alias      = $this->app['route']->getAlias();
@@ -150,7 +150,7 @@ 
                     $val = $item->getRoute();
 
                     if (0 === strpos($url, $val)) {
-                        $url        = $key . substr($url, strlen($val));
+                        $url        = $key.substr($url, strlen($val));
                         $matchAlias = true;
                         break;
                     }
@@ -200,38 +200,38 @@ 
         }
 
         // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
+        $anchor = !empty($anchor) ? '#'.$anchor : '';
 
         // 参数组装
         if (!empty($vars)) {
             // 添加参数
             if ($this->config['url_common_param']) {
                 $vars = http_build_query($vars);
-                $url .= $suffix . '?' . $vars . $anchor;
+                $url .= $suffix.'?'.$vars.$anchor;
             } else {
                 $paramType = $this->config['url_param_type'];
 
                 foreach ($vars as $var => $val) {
                     if ('' !== trim($val)) {
                         if ($paramType) {
-                            $url .= $depr . urlencode($val);
+                            $url .= $depr.urlencode($val);
                         } else {
-                            $url .= $depr . $var . $depr . urlencode($val);
+                            $url .= $depr.$var.$depr.urlencode($val);
                         }
                     }
                 }
 
-                $url .= $suffix . $anchor;
+                $url .= $suffix.$anchor;
             }
         } else {
-            $url .= $suffix . $anchor;
+            $url .= $suffix.$anchor;
         }
 
         // 检测域名
         $domain = $this->parseDomain($url, $domain);
 
         // URL组装
-        $url = $domain . rtrim($this->root ?: $this->app['request']->root(), '/') . '/' . ltrim($url, '/');
+        $url = $domain.rtrim($this->root ?: $this->app['request']->root(), '/').'/'.ltrim($url, '/');
 
         $this->bindCheck = false;
 
@@ -255,7 +255,7 @@ 
         } else {
             // 解析到 模块/控制器/操作
             $module     = $request->module();
-            $module     = $module ? $module . '/' : '';
+            $module     = $module ? $module.'/' : '';
             $controller = $request->controller();
 
             if ('' == $url) {
@@ -264,7 +264,7 @@ 
                 $path       = explode('/', $url);
                 $action     = array_pop($path);
                 $controller = empty($path) ? $controller : array_pop($path);
-                $module     = empty($path) ? $module : array_pop($path) . '/';
+                $module     = empty($path) ? $module : array_pop($path).'/';
             }
 
             if ($this->config['url_convert']) {
@@ -272,7 +272,7 @@ 
                 $controller = Loader::parseName($controller);
             }
 
-            $url = $module . $controller . '/' . $action;
+            $url = $module.$controller.'/'.$action;
         }
 
         return $url;
@@ -319,7 +319,7 @@ 
                 }
             }
         } elseif (0 !== strpos($domain, $rootDomain) && false === strpos($domain, '.')) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -329,7 +329,7 @@ 
 
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     // 解析URL后缀
@@ -343,7 +343,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.'.$suffix;
     }
 
     // 匹配路由地址
@@ -358,7 +358,7 @@ 
             }
 
             if ($port && !in_array($port, [80, 443])) {
-                $domain .= ':' . $port;
+                $domain .= ':'.$port;
             }
 
             if (empty($pattern)) {
@@ -370,12 +370,12 @@ 
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url    = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
+                    $url    = str_replace(['[:'.$key.']', '<'.$key.'?>', ':'.$key, '<'.$key.'>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
                     $keys[] = $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 {

library/think/route/dispatch/Url.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
         if (!empty($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);
         }
 
         list($path, $var) = $this->rule->parseUrlPath($url);
@@ -61,7 +61,7 @@ 
         }
 
         if ($controller && !preg_match('/^[A-Za-z0-9][\w|\.]*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
+            throw new HttpException(404, 'controller not exists:'.$controller);
         }
 
         // 解析操作
@@ -72,7 +72,7 @@ 
             if ($this->rule->getConfig('url_param_type')) {
                 $var += $path;
             } else {
-                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));
             }
@@ -92,7 +92,7 @@ 
         $route = [$module, $controller, $action];
 
         if ($this->hasDefinedRoute($route, $bind)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -110,12 +110,12 @@ 
         list($module, $controller, $action) = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower($module . '/' . Loader::parseName($controller, 1) . '/' . $action);
+        $name = strtolower($module.'/'.Loader::parseName($controller, 1).'/'.$action);
 
         $name2 = '';
 
         if (empty($module) || $module == $bind) {
-            $name2 = strtolower(Loader::parseName($controller, 1) . '/' . $action);
+            $name2 = strtolower(Loader::parseName($controller, 1).'/'.$action);
         }
 
         $host = $this->request->host(true);
@@ -138,7 +138,7 @@ 
      */
     protected function autoFindController($module, &$path)
     {
-        $dir    = $this->app->getAppPath() . ($module ? $module . '/' : '') . $this->rule->getConfig('url_controller_layer');
+        $dir    = $this->app->getAppPath().($module ? $module.'/' : '').$this->rule->getConfig('url_controller_layer');
         $suffix = $this->app->getSuffix() || $this->rule->getConfig('controller_suffix') ? ucfirst($this->rule->getConfig('url_controller_layer')) : '';
 
         $item = [];
@@ -146,13 +146,13 @@ 
 
         foreach ($path as $val) {
             $item[] = $val;
-            $file   = $dir . '/' . str_replace('.', '/', $val) . $suffix . '.php';
-            $file   = pathinfo($file, PATHINFO_DIRNAME) . '/' . Loader::parseName(pathinfo($file, PATHINFO_FILENAME), 1) . '.php';
+            $file   = $dir.'/'.str_replace('.', '/', $val).$suffix.'.php';
+            $file   = pathinfo($file, PATHINFO_DIRNAME).'/'.Loader::parseName(pathinfo($file, PATHINFO_FILENAME), 1).'.php';
             if (is_file($file)) {
                 $find = true;
                 break;
             } else {
-                $dir .= '/' . Loader::parseName($val);
+                $dir .= '/'.Loader::parseName($val);
             }
         }
 

library/think/db/Query.php

Spacing +41 added lines, -41 removed lines

@@ -189,15 +189,15 @@ 
             $name = Loader::parseName(substr($method, 5));
             array_unshift($args, $name);
             return call_user_func_array([$this, 'where'], $args);
-        } elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
+        } elseif ($this->model && method_exists($this->model, 'scope'.$method)) {
             // 动态调用命名范围
-            $method = 'scope' . $method;
+            $method = 'scope'.$method;
             array_unshift($args, $this);
 
             call_user_func_array([$this->model, $method], $args);
             return $this;
         } else {
-            throw new Exception('method not exist:' . ($this->model ? get_class($this->model) : static::class) . '->' . $method);
+            throw new Exception('method not exist:'.($this->model ? get_class($this->model) : static::class).'->'.$method);
         }
     }
 
@@ -316,7 +316,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . Loader::parseName($name);
+        return $this->prefix.Loader::parseName($name);
     }
 
     /**
@@ -588,16 +588,16 @@ 
                     $seq = (ord(substr($value, 0, 1)) % $rule['num']) + 1;
             }
 
-            return $this->getTable() . '_' . $seq;
+            return $this->getTable().'_'.$seq;
         }
         // 当设置的分表字段不在查询条件或者数据中
         // 进行联合查询，必须设定 partition['num']
         $tableName = [];
         for ($i = 0; $i < $rule['num']; $i++) {
-            $tableName[] = 'SELECT * FROM ' . $this->getTable() . '_' . ($i + 1);
+            $tableName[] = 'SELECT * FROM '.$this->getTable().'_'.($i + 1);
         }
 
-        return ['( ' . implode(" UNION ", $tableName) . ' )' => $this->name];
+        return ['( '.implode(" UNION ", $tableName).' )' => $this->name];
     }
 
     /**
@@ -663,7 +663,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();
 
@@ -766,7 +766,7 @@ 
 
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->lazyWrite('inc', $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -799,7 +799,7 @@ 
 
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->lazyWrite('dec', $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -830,15 +830,15 @@ 
     {
         $cache = Container::get('cache');
 
-        if (!$cache->has($guid . '_time')) {
+        if (!$cache->has($guid.'_time')) {
             // 计时开始
-            $cache->set($guid . '_time', time(), 0);
+            $cache->set($guid.'_time', time(), 0);
             $cache->$type($guid, $step);
-        } elseif (time() > $cache->get($guid . '_time') + $lazyTime) {
+        } elseif (time() > $cache->get($guid.'_time') + $lazyTime) {
             // 删除缓存
             $value = $cache->$type($guid, $step);
             $cache->rm($guid);
-            $cache->rm($guid . '_time');
+            $cache->rm($guid.'_time');
             return 0 === $value ? false : $value;
         } else {
             // 更新缓存
@@ -1037,10 +1037,10 @@ 
             $prefix = $prefix ?: $tableName;
             foreach ($field as $key => &$val) {
                 if (is_numeric($key) && $alias) {
-                    $field[$prefix . '.' . $val] = $alias . $val;
+                    $field[$prefix.'.'.$val] = $alias.$val;
                     unset($field[$key]);
                 } elseif (is_numeric($key)) {
-                    $val = $prefix . '.' . $val;
+                    $val = $prefix.'.'.$val;
                 }
             }
         }
@@ -1167,7 +1167,7 @@ 
             $table  = $this->getJoinTable($join, $alias);
 
             if (true === $field) {
-                $fields = $alias . '.*';
+                $fields = $alias.'.*';
             } else {
                 if (is_string($field)) {
                     $field = explode(',', $field);
@@ -1175,17 +1175,17 @@ 
 
                 foreach ($field as $key => $val) {
                     if (is_numeric($key)) {
-                        $fields[] = $alias . '.' . $val;
+                        $fields[] = $alias.'.'.$val;
 
-                        $this->options['map'][$val] = $alias . '.' . $val;
+                        $this->options['map'][$val] = $alias.'.'.$val;
                     } else {
                         if (preg_match('/[,=\.\'\"\(\s]/', $key)) {
                             $name = $key;
                         } else {
-                            $name = $alias . '.' . $key;
+                            $name = $alias.'.'.$key;
                         }
 
-                        $fields[] = $name . ' AS ' . $val;
+                        $fields[] = $name.' AS '.$val;
 
                         $this->options['map'][$val] = $name;
                     }
@@ -1498,9 +1498,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);
             }
         }
     }
@@ -1544,7 +1544,7 @@ 
         }
 
         if (is_string($field) && !empty($this->options['via']) && false === strpos($field, '.')) {
-            $field = $this->options['via'] . '.' . $field;
+            $field = $this->options['via'].'.'.$field;
         }
 
         if ($field instanceof Expression) {
@@ -1728,7 +1728,7 @@ 
             list($offset, $length) = explode(',', $offset);
         }
 
-        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+        $this->options['limit'] = intval($offset).($length ? ','.intval($length) : '');
 
         return $this;
     }
@@ -1785,7 +1785,7 @@ 
         }
 
         /** @var Paginator $class */
-        $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']);
+        $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\'.ucwords($config['type']);
         $page  = isset($config['page']) ? (int) $config['page'] : call_user_func([
             $class,
             'getCurrentPage',
@@ -1895,7 +1895,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
 
             if (strpos($field, ',')) {
@@ -1906,9 +1906,9 @@ 
         } elseif (!empty($this->options['via'])) {
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $field[$key] = $this->options['via'] . '.' . $val;
+                    $field[$key] = $this->options['via'].'.'.$val;
                 } else {
-                    $field[$this->options['via'] . '.' . $key] = $val;
+                    $field[$this->options['via'].'.'.$key] = $val;
                     unset($field[$key]);
                 }
             }
@@ -2320,7 +2320,7 @@ 
         if ($this->model) {
             // 检查模型类的查询范围方法
             foreach ($scope as $name) {
-                $method = 'scope' . trim($name);
+                $method = 'scope'.trim($name);
 
                 if (method_exists($this->model, $method)) {
                     call_user_func_array([$this->model, $method], $args);
@@ -2347,7 +2347,7 @@ 
             } elseif ($this->model) {
                 // 检测搜索器
                 $fieldName = is_numeric($key) ? $field : $key;
-                $method    = 'search' . Loader::parseName($fieldName, 1) . 'Attr';
+                $method    = 'search'.Loader::parseName($fieldName, 1).'Attr';
 
                 if (method_exists($this->model, $method)) {
                     $this->model->$method($this, isset($data[$field]) ? $data[$field] : null, $data, $prefix);
@@ -2412,7 +2412,7 @@ 
             $op = is_array($range) ? 'between' : '>=';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -2490,7 +2490,7 @@ 
         if (is_array($value)) {
             $this->bind = array_merge($this->bind, $value);
         } else {
-            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_' . mt_rand() . '_';
+            $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_'.mt_rand().'_';
 
             $this->bind[$name] = [$value, $type];
             return $name;
@@ -2707,10 +2707,10 @@ 
                 $count = $this->model->$relation()->getRelationCountQuery($closure, $aggregate, $field, $aggregateField);
 
                 if (empty($aggregateField)) {
-                    $aggregateField = Loader::parseName($relation) . '_' . $aggregate;
+                    $aggregateField = Loader::parseName($relation).'_'.$aggregate;
                 }
 
-                $this->field(['(' . $count . ')' => $aggregateField]);
+                $this->field(['('.$count.')' => $aggregateField]);
             }
         }
 
@@ -3429,10 +3429,10 @@ 
     {
         if (!empty($this->model)) {
             $class = get_class($this->model);
-            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $options);
+            throw new ModelNotFoundException('model data Not Found:'.$class, $class, $options);
         }
         $table = is_array($options['table']) ? key($options['table']) : $options['table'];
-        throw new DataNotFoundException('table data not Found:' . $table, $table, $options);
+        throw new DataNotFoundException('table data not Found:'.$table, $table, $options);
     }
 
     /**
@@ -3568,7 +3568,7 @@ 
      */
     public function buildSql($sub = true)
     {
-        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+        return $sub ? '( '.$this->select(false).' )' : $this->select(false);
     }
 
     /**
@@ -3639,7 +3639,7 @@ 
         }
 
         if (is_string($pk)) {
-            $key = isset($alias) ? $alias . '.' . $pk : $pk;
+            $key = isset($alias) ? $alias.'.'.$pk : $pk;
             // 根据主键查询
             if (is_array($data)) {
                 $where[$pk] = isset($data[$pk]) ? [$key, '=', $data[$pk]] : [$key, 'in', $data];
@@ -3650,7 +3650,7 @@ 
             // 根据复合主键查询
             foreach ($pk as $key) {
                 if (isset($data[$key])) {
-                    $attr        = isset($alias) ? $alias . '.' . $key : $key;
+                    $attr        = isset($alias) ? $alias.'.'.$key : $key;
                     $where[$key] = [$attr, '=', $data[$key]];
                 } else {
                     throw new Exception('miss complex primary data');
@@ -3726,7 +3726,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows > 0 ? $listRows : (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;

library/think/db/builder/Mysql.php

Spacing +8 added lines, -8 removed lines

@@ -64,7 +64,7 @@ 
         foreach ($dataSet as $k => $data) {
             $data = $this->parseData($query, $data, $allowFields, $bind);
 
-            $values[] = '( ' . implode(',', array_values($data)) . ' )';
+            $values[] = '( '.implode(',', array_values($data)).' )';
 
             if (!isset($insertFields)) {
                 $insertFields = array_keys($data);
@@ -104,7 +104,7 @@ 
             $value = $value->getValue();
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -125,17 +125,17 @@ 
 
         $key = trim($key);
 
-        if(strpos($key, '->>') && false === strpos($key, '(')){
+        if (strpos($key, '->>') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->>', $key, 2);
 
-            return $this->parseKey($query, $field, true) . '->>\'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->>', '.', $name) . '\'';
+            return $this->parseKey($query, $field, true).'->>\'$'.(strpos($name, '[') === 0 ? '' : '.').str_replace('->>', '.', $name).'\'';
         }
         elseif (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
 
-            return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
+            return 'json_extract('.$this->parseKey($query, $field, true).', \'$'.(strpos($name, '[') === 0 ? '' : '.').str_replace('->', '.', $name).'\')';
         } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -152,11 +152,11 @@ 
         }
 
         if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
-            throw new Exception('not support data:' . $key);
+            throw new Exception('not support data:'.$key);
         }
 
         if ('*' != $key && !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
-            $key = '`' . $key . '`';
+            $key = '`'.$key.'`';
         }
 
         if (isset($table)) {
@@ -164,7 +164,7 @@ 
                 $table = str_replace('.', '`.`', $table);
             }
 
-            $key = '`' . $table . '`.' . $key;
+            $key = '`'.$table.'`.'.$key;
         }
 
         return $key;

Braces +1 added lines, -2 removed lines

@@ -130,8 +130,7 @@
             list($field, $name) = explode('->>', $key, 2);
 
             return $this->parseKey($query, $field, true) . '->>\'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->>', '.', $name) . '\'';
-        }
-        elseif (strpos($key, '->') && false === strpos($key, '(')) {
+        } elseif (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
 

library/think/model/relation/HasOne.php

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
         }
 
         return $this->query
-            ->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->whereExp($this->foreignKey, '='.$this->parent->getTable().'.'.$this->localKey)
             ->fetchSql()
             ->$aggregate($field);
     }
@@ -144,12 +144,12 @@ 
 
         return $this->parent->db()
             ->alias($model)
-            ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey, $softDelete) {
+            ->whereExists(function($query) use ($table, $model, $relation, $localKey, $foreignKey, $softDelete) {
                 $query->table([$table => $relation])
-                    ->field($relation . '.' . $foreignKey)
-                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey)
-                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    ->field($relation.'.'.$foreignKey)
+                    ->whereExp($model.'.'.$localKey, '='.$relation.'.'.$foreignKey)
+                    ->when($softDelete, function($query) use ($softDelete, $relation) {
+                        $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
                     });
             });
     }
@@ -177,9 +177,9 @@ 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
-            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
-            ->when($softDelete, function ($query) use ($softDelete, $relation) {
-                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            ->join([$table => $relation], $model.'.'.$this->localKey.'='.$relation.'.'.$this->foreignKey, $this->joinType)
+            ->when($softDelete, function($query) use ($softDelete, $relation) {
+                $query->where($relation.strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
             })
             ->where($where);
     }

library/think/App.php

Spacing +52 added lines, -52 removed lines

@@ -126,7 +126,7 @@ 
 

     public function __construct($appPath = '')

     {

-        $this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;

+        $this->thinkPath = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;

         $this->path($appPath);

     }

 

@@ -150,7 +150,7 @@ 
      */

     public function path($path)

     {

-        $this->appPath = $path ? realpath($path) . DIRECTORY_SEPARATOR : $this->getAppPath();

+        $this->appPath = $path ? realpath($path).DIRECTORY_SEPARATOR : $this->getAppPath();

 

         return $this;

     }

@@ -170,24 +170,24 @@ 
         $this->beginTime   = microtime(true);

         $this->beginMem    = memory_get_usage();

 

-        $this->rootPath    = dirname($this->appPath) . DIRECTORY_SEPARATOR;

-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;

-        $this->routePath   = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;

-        $this->configPath  = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;

+        $this->rootPath    = dirname($this->appPath).DIRECTORY_SEPARATOR;

+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;

+        $this->routePath   = $this->rootPath.'route'.DIRECTORY_SEPARATOR;

+        $this->configPath  = $this->rootPath.'config'.DIRECTORY_SEPARATOR;

 

         static::setInstance($this);

 

         $this->instance('app', $this);

 

         // 加载环境变量配置文件

-        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');

 

         // 加载惯例配置文件

-        $this->config->set(include $this->thinkPath . 'convention.php');

+        $this->config->set(include $this->thinkPath.'convention.php');

 

         // 设置路径环境变量

         $this->env->set([

@@ -197,8 +197,8 @@ 
             'config_path'  => $this->configPath,

             'route_path'   => $this->routePath,

             'runtime_path' => $this->runtimePath,

-            'extend_path'  => $this->rootPath . 'extend' . DIRECTORY_SEPARATOR,

-            'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,

+            'extend_path'  => $this->rootPath.'extend'.DIRECTORY_SEPARATOR,

+            'vendor_path'  => $this->rootPath.'vendor'.DIRECTORY_SEPARATOR,

         ]);

 

         $this->namespace = $this->env->get('app_namespace', $this->namespace);

@@ -268,61 +268,61 @@ 
     public function init($module = '')

     {

         // 定位模块目录

-        $module = $module ? $module . DIRECTORY_SEPARATOR : '';

-        $path   = $this->appPath . $module;

+        $module = $module ? $module.DIRECTORY_SEPARATOR : '';

+        $path   = $this->appPath.$module;

 

         // 加载初始化文件

-        if (is_file($path . 'init.php')) {

-            include $path . 'init.php';

-        } elseif (is_file($this->runtimePath . $module . 'init.php')) {

-            include $this->runtimePath . $module . 'init.php';

+        if (is_file($path.'init.php')) {

+            include $path.'init.php';

+        } elseif (is_file($this->runtimePath.$module.'init.php')) {

+            include $this->runtimePath.$module.'init.php';

         } else {

             // 加载行为扩展文件

-            if (is_file($path . 'tags.php')) {

-                $tags = include $path . 'tags.php';

+            if (is_file($path.'tags.php')) {

+                $tags = include $path.'tags.php';

                 if (is_array($tags)) {

                     $this->hook->import($tags);

                 }

             }

 

             // 加载公共文件

-            if (is_file($path . 'common.php')) {

-                include_once $path . 'common.php';

+            if (is_file($path.'common.php')) {

+                include_once $path.'common.php';

             }

 

             if ('' == $module) {

                 // 加载系统助手函数

-                include $this->thinkPath . 'helper.php';

+                include $this->thinkPath.'helper.php';

             }

 

             // 加载中间件

-            if (is_file($path . 'middleware.php')) {

-                $middleware = include $path . 'middleware.php';

+            if (is_file($path.'middleware.php')) {

+                $middleware = include $path.'middleware.php';

                 if (is_array($middleware)) {

                     $this->middleware->import($middleware);

                 }

             }

 

             // 注册服务的容器对象实例

-            if (is_file($path . 'provider.php')) {

-                $provider = include $path . 'provider.php';

+            if (is_file($path.'provider.php')) {

+                $provider = include $path.'provider.php';

                 if (is_array($provider)) {

                     $this->bindTo($provider);

                 }

             }

 

             // 自动读取配置文件

-            if (is_dir($path . 'config')) {

-                $dir = $path . 'config' . DIRECTORY_SEPARATOR;

-            } elseif (is_dir($this->configPath . $module)) {

-                $dir = $this->configPath . $module;

+            if (is_dir($path.'config')) {

+                $dir = $path.'config'.DIRECTORY_SEPARATOR;

+            } elseif (is_dir($this->configPath.$module)) {

+                $dir = $this->configPath.$module;

             }

 

             $files = isset($dir) ? scandir($dir) : [];

 

             foreach ($files as $file) {

-                if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {

-                    $this->config->load($dir . $file, pathinfo($file, PATHINFO_FILENAME));

+                if ('.'.pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {

+                    $this->config->load($dir.$file, pathinfo($file, PATHINFO_FILENAME));

                 }

             }

         }

@@ -356,7 +356,7 @@ 
         $this->cache->init($config['cache'], true);

 

         // 加载当前模块语言包

-        $this->lang->load($this->appPath . $module . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php');

+        $this->lang->load($this->appPath.$module.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php');

 

         // 模块请求缓存检查

         $this->checkRequestCache(

@@ -387,7 +387,7 @@ 
             } elseif ($this->config('app.auto_bind_module')) {

                 // 入口自动绑定

                 $name = pathinfo($this->request->baseFile(), PATHINFO_FILENAME);

-                if ($name && 'index' != $name && is_dir($this->appPath . $name)) {

+                if ($name && 'index' != $name && is_dir($this->appPath.$name)) {

                     $this->route->bind($name);

                 }

             }

@@ -407,9 +407,9 @@ 
 

             // 记录路由和请求信息

             if ($this->appDebug) {

-                $this->log('[ ROUTE ] ' . var_export($this->request->routeInfo(), true));

-                $this->log('[ HEADER ] ' . var_export($this->request->header(), true));

-                $this->log('[ PARAM ] ' . var_export($this->request->param(), true));

+                $this->log('[ ROUTE ] '.var_export($this->request->routeInfo(), true));

+                $this->log('[ HEADER ] '.var_export($this->request->header(), true));

+                $this->log('[ PARAM ] '.var_export($this->request->param(), true));

             }

 

             // 监听app_begin

@@ -428,7 +428,7 @@ 
             $data     = $exception->getResponse();

         }

 

-        $this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {

+        $this->middleware->add(function(Request $request, $next) use ($dispatch, $data) {

             return is_null($data) ? $dispatch->run() : $data;

         });

 

@@ -446,7 +446,7 @@ 
             $closure  = $this->config->get('route_check_cache_key');

             $routeKey = $closure($this->request);

         } else {

-            $routeKey = md5($this->request->baseUrl(true) . ':' . $this->request->method());

+            $routeKey = md5($this->request->baseUrl(true).':'.$this->request->method());

         }

 

         return $routeKey;

@@ -466,8 +466,8 @@ 
 

         // 加载系统语言包

         $this->lang->load([

-            $this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',

-            $this->appPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',

+            $this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',

+            $this->appPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',

         ]);

     }

 

@@ -549,7 +549,7 @@ 
     {

         // 路由检测

         if (is_dir($this->routePath)) {

-            $files = glob($this->routePath . '*.php');

+            $files = glob($this->routePath.'*.php');

             foreach ($files as $file) {

                 $rules = include $file;

                 if (is_array($rules)) {

@@ -565,7 +565,7 @@ 
                 $this->build->buildRoute($suffix);

             }

 

-            $filename = $this->runtimePath . 'build_route.php';

+            $filename = $this->runtimePath.'build_route.php';

 

             if (is_file($filename)) {

                 include $filename;

@@ -666,7 +666,7 @@ 
      */

     public function create($name, $layer, $appendSuffix = false, $common = 'common')

     {

-        $guid = $name . $layer;

+        $guid = $name.$layer;

 

         if ($this->__isset($guid)) {

             return $this->__get($guid);

@@ -677,11 +677,11 @@ 
         if (class_exists($class)) {

             $object = $this->__get($class);

         } else {

-            $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);

+            $class = str_replace('\\'.$module.'\\', '\\'.$common.'\\', $class);

             if (class_exists($class)) {

                 $object = $this->__get($class);

             } else {

-                throw new ClassNotFoundException('class not exists:' . $class, $class);

+                throw new ClassNotFoundException('class not exists:'.$class, $class);

             }

         }

 

@@ -725,7 +725,7 @@ 
             return $this->make($emptyClass, true);

         }

 

-        throw new ClassNotFoundException('class not exists:' . $class, $class);

+        throw new ClassNotFoundException('class not exists:'.$class, $class);

     }

 

     /**

@@ -786,7 +786,7 @@ 
             }

         }

 

-        return $this->invokeMethod([$class, $action . $this->config('action_suffix')], $vars);

+        return $this->invokeMethod([$class, $action.$this->config('action_suffix')], $vars);

     }

 

     /**

@@ -802,10 +802,10 @@ 
     {

         $name  = str_replace(['/', '.'], '\\', $name);

         $array = explode('\\', $name);

-        $class = Loader::parseName(array_pop($array), 1) . ($this->suffix || $appendSuffix ? ucfirst($layer) : '');

-        $path  = $array ? implode('\\', $array) . '\\' : '';

+        $class = Loader::parseName(array_pop($array), 1).($this->suffix || $appendSuffix ? ucfirst($layer) : '');

+        $path  = $array ? implode('\\', $array).'\\' : '';

 

-        return $this->namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class;

+        return $this->namespace.'\\'.($module ? $module.'\\' : '').$layer.'\\'.$path.$class;

     }

 

     /**

@@ -868,7 +868,7 @@ 
     public function getAppPath()

     {

         if (is_null($this->appPath)) {

-            $this->appPath = Loader::getRootPath() . 'application' . DIRECTORY_SEPARATOR;

+            $this->appPath = Loader::getRootPath().'application'.DIRECTORY_SEPARATOR;

         }

 

         return $this->appPath;

library/think/Request.php

Spacing +23 added lines, -23 removed lines

@@ -331,7 +331,7 @@ 
             return call_user_func_array($this->hook[$method], $args);
         }
 
-        throw new Exception('method not exists:' . static::class . '->' . $method);
+        throw new Exception('method not exists:'.static::class.'->'.$method);
     }
 
     /**
@@ -385,7 +385,7 @@ 
 
         if (isset($info['port'])) {
             $server['SERVER_PORT'] = $info['port'];
-            $server['HTTP_HOST']   = $server['HTTP_HOST'] . ':' . $info['port'];
+            $server['HTTP_HOST']   = $server['HTTP_HOST'].':'.$info['port'];
         }
 
         if (isset($info['user'])) {
@@ -423,7 +423,7 @@ 
             $options['get'] = isset($options['get']) ? array_merge($get, $options['get']) : $get;
         }
 
-        $server['REQUEST_URI']  = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
+        $server['REQUEST_URI']  = $info['path'].('' !== $queryString ? '?'.$queryString : '');
         $server['QUERY_STRING'] = $queryString;
         $options['cookie']      = $cookie;
         $options['param']       = $params;
@@ -433,7 +433,7 @@ 
         $options['baseUrl']     = $info['path'];
         $options['pathinfo']    = '/' == $info['path'] ? '/' : ltrim($info['path'], '/');
         $options['method']      = $server['REQUEST_METHOD'];
-        $options['domain']      = isset($info['scheme']) ? $info['scheme'] . '://' . $server['HTTP_HOST'] : '';
+        $options['domain']      = isset($info['scheme']) ? $info['scheme'].'://'.$server['HTTP_HOST'] : '';
         $options['content']     = $content;
 
         $request = new static();
@@ -454,7 +454,7 @@ 
      */
     public function domain($port = false)
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -469,7 +469,7 @@ 
         if (!$root) {
             $item  = explode('.', $this->host(true));
             $count = count($item);
-            $root  = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
+            $root  = $count > 1 ? $item[$count - 2].'.'.$item[$count - 1] : $item[0];
         }
 
         return $root;
@@ -549,13 +549,13 @@ 
             } elseif ($this->server('REQUEST_URI')) {
                 $this->url = $this->server('REQUEST_URI');
             } elseif ($this->server('ORIG_PATH_INFO')) {
-                $this->url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+                $this->url = $this->server('ORIG_PATH_INFO').(!empty($this->server('QUERY_STRING')) ? '?'.$this->server('QUERY_STRING') : '');
             } else {
                 $this->url = '';
             }
         }
 
-        return $complete ? $this->domain() . $this->url : $this->url;
+        return $complete ? $this->domain().$this->url : $this->url;
     }
 
     /**
@@ -583,7 +583,7 @@ 
             $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
 
-        return $domain ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return $domain ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -604,8 +604,8 @@ 
                     $url = $this->server('PHP_SELF');
                 } elseif (basename($this->server('ORIG_SCRIPT_NAME')) === $script_name) {
                     $url = $this->server('ORIG_SCRIPT_NAME');
-                } elseif (($pos = strpos($this->server('PHP_SELF'), '/' . $script_name)) !== false) {
-                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos) . '/' . $script_name;
+                } elseif (($pos = strpos($this->server('PHP_SELF'), '/'.$script_name)) !== false) {
+                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos).'/'.$script_name;
                 } elseif ($this->server('DOCUMENT_ROOT') && strpos($this->server('SCRIPT_FILENAME'), $this->server('DOCUMENT_ROOT')) === 0) {
                     $url = str_replace('\\', '/', str_replace($this->server('DOCUMENT_ROOT'), '', $this->server('SCRIPT_FILENAME')));
                 }
@@ -613,7 +613,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $domain ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $domain ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -644,7 +644,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $domain ? $this->domain() . $this->root : $this->root;
+        return $domain ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -658,7 +658,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -729,10 +729,10 @@ 
                 $this->path = $pathinfo;
             } elseif ($suffix) {
                 // 去除正常的URL后缀
-                $this->path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+                $this->path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
             } else {
                 // 允许任何后缀访问
-                $this->path = preg_replace('/\.' . $this->ext() . '$/i', '', $pathinfo);
+                $this->path = preg_replace('/\.'.$this->ext().'$/i', '', $pathinfo);
             }
         }
 
@@ -1211,8 +1211,8 @@ 
             if ($file instanceof File) {
                 $array[$key] = $file;
             } elseif (is_array($file['name'])) {
-                $keys  = array_keys($file);
-                $subFileNames=array_keys($file['name']);
+                $keys = array_keys($file);
+                $subFileNames = array_keys($file['name']);
 
                 foreach ($subFileNames as $index => $subFileName) {
                     if ($file['error'][$subFileName] > 0) {
@@ -1512,7 +1512,7 @@ 
                 if (is_scalar($data)) {
                     $data = (string) $data;
                 } else {
-                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                    throw new \InvalidArgumentException('variable type error：'.gettype($data));
                 }
                 break;
         }
@@ -2024,7 +2024,7 @@ 
         $token = call_user_func($type, $this->server('REQUEST_TIME_FLOAT'));
 
         if ($this->isAjax()) {
-            header($name . ': ' . $token);
+            header($name.': '.$token);
         }
 
         facade\Session::set($name, $token);
@@ -2079,12 +2079,12 @@ 
         if (false !== strpos($key, ':')) {
             $param = $this->param();
             foreach ($param as $item => $val) {
-                if (is_string($val) && false !== strpos($key, ':' . $item)) {
-                    $key = str_replace(':' . $item, $val, $key);
+                if (is_string($val) && false !== strpos($key, ':'.$item)) {
+                    $key = str_replace(':'.$item, $val, $key);
                 }
             }
         } elseif (strpos($key, ']')) {
-            if ('[' . $this->ext() . ']' == $key) {
+            if ('['.$this->ext().']' == $key) {
                 // 缓存某个后缀的请求
                 $key = md5($this->url());
             } else {