top-think / framework

src/think/db/Raw.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;
 

src/think/db/exception/DataNotFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\exception;
 

src/think/db/exception/BindParamException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\exception;
 

src/think/cache/driver/Memcache.php

Spacing +2 added lines, -4 removed lines

@@ -56,8 +56,7 @@ 
         foreach ($hosts as $i => $host) {
             $port = $ports[$i] ?? $ports[0];
             $this->options['timeout'] > 0 ?
-            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, $this->options['timeout']) :
-            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
+            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, $this->options['timeout']) : $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
         }
     }
 
@@ -174,8 +173,7 @@ 
         $key = $this->getCacheKey($name);
 
         return false === $ttl ?
-        $this->handler->delete($key) :
-        $this->handler->delete($key, $ttl);
+        $this->handler->delete($key) : $this->handler->delete($key, $ttl);
     }
 
     /**

src/think/db/Builder.php

Spacing +65 added lines, -65 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -158,20 +158,20 @@ 
             if (false !== strpos($key, '->')) {
                 list($key, $name) = explode('->', $key, 2);
                 $item             = $this->parseKey($query, $key);
-                $result[$item]    = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')';
+                $result[$item]    = 'json_set('.$item.', \'$.'.$name.'\', '.$this->parseDataBind($query, $key.'->'.$name, $val, $bind).')';
             } elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) {
                 if ($options['strict']) {
-                    throw new Exception('fields not exists:[' . $key . ']');
+                    throw new Exception('fields not exists:['.$key.']');
                 }
             } elseif (is_null($val)) {
                 $result[$item] = 'NULL';
             } elseif (is_array($val) && !empty($val)) {
                 switch (strtoupper($val[0])) {
                     case 'INC':
-                        $result[$item] = $item . ' + ' . floatval($val[1]);
+                        $result[$item] = $item.' + '.floatval($val[1]);
                         break;
                     case 'DEC':
-                        $result[$item] = $item . ' - ' . floatval($val[1]);
+                        $result[$item] = $item.' - '.floatval($val[1]);
                         break;
                 }
             } elseif (is_scalar($val)) {
@@ -200,7 +200,7 @@ 
 
         $name = $query->bindValue($data, $bind[$key] ?? PDO::PARAM_STR);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -225,7 +225,7 @@ 
      */
     protected function parseExtra(Query $query, string $extra): string
     {
-        return preg_match('/^[\w]+$/i', $extra) ? ' ' . strtoupper($extra) : '';
+        return preg_match('/^[\w]+$/i', $extra) ? ' '.strtoupper($extra) : '';
     }
 
     /**
@@ -245,7 +245,7 @@ 
                 if ($field instanceof Raw) {
                     $array[] = $field->getValue();
                 } elseif (!is_numeric($key)) {
-                    $array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field, true);
+                    $array[] = $this->parseKey($query, $key).' AS '.$this->parseKey($query, $field, true);
                 } else {
                     $array[] = $this->parseKey($query, $field);
                 }
@@ -275,9 +275,9 @@ 
             if ($table instanceof Raw) {
                 $item[] = $table->getValue();
             } elseif (!is_numeric($key)) {
-                $item[] = $this->parseKey($query, $key) . ' ' . $this->parseKey($query, $table);
+                $item[] = $this->parseKey($query, $key).' '.$this->parseKey($query, $table);
             } elseif (isset($options['alias'][$table])) {
-                $item[] = $this->parseKey($query, $table) . ' ' . $this->parseKey($query, $options['alias'][$table]);
+                $item[] = $this->parseKey($query, $table).' '.$this->parseKey($query, $options['alias'][$table]);
             } else {
                 $item[] = $this->parseKey($query, $table);
             }
@@ -303,11 +303,11 @@ 
             list($field, $condition) = $options['soft_delete'];
 
             $binds    = $query->getFieldsBindType();
-            $whereStr = $whereStr ? '( ' . $whereStr . ' ) AND ' : '';
-            $whereStr = $whereStr . $this->parseWhereItem($query, $field, $condition, $binds);
+            $whereStr = $whereStr ? '( '.$whereStr.' ) AND ' : '';
+            $whereStr = $whereStr.$this->parseWhereItem($query, $field, $condition, $binds);
         }
 
-        return empty($whereStr) ? '' : ' WHERE ' . $whereStr;
+        return empty($whereStr) ? '' : ' WHERE '.$whereStr;
     }
 
     /**
@@ -350,17 +350,17 @@ 
         $where = [];
         foreach ($val as $value) {
             if ($value instanceof Raw) {
-                $where[] = ' ' . $logic . ' ( ' . $value->getValue() . ' )';
+                $where[] = ' '.$logic.' ( '.$value->getValue().' )';
                 continue;
             }
 
             if (is_array($value)) {
                 if (key($value) !== 0) {
-                    throw new Exception('where express error:' . var_export($value, true));
+                    throw new Exception('where express error:'.var_export($value, true));
                 }
                 $field = array_shift($value);
             } elseif (!($value instanceof Closure)) {
-                throw new Exception('where express error:' . var_export($value, true));
+                throw new Exception('where express error:'.var_export($value, true));
             }
 
             if ($value instanceof Closure) {
@@ -369,7 +369,7 @@ 
             } elseif (is_array($field)) {
                 $where[] = $this->parseMultiWhereField($query, $value, $field, $logic, $binds);
             } elseif ($field instanceof Raw) {
-                $where[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $binds);
+                $where[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $binds);
             } elseif (strpos($field, '|')) {
                 $where[] = $this->parseFieldsOr($query, $value, $field, $logic, $binds);
             } elseif (strpos($field, '&')) {
@@ -377,7 +377,7 @@ 
             } else {
                 // 对字段使用表达式查询
                 $field   = is_string($field) ? $field : '';
-                $where[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $binds);
+                $where[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $binds);
             }
         }
 
@@ -402,7 +402,7 @@ 
             $item[] = $this->parseWhereItem($query, $k, $value, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' AND ', $item) . ' )';
+        return ' '.$logic.' ( '.implode(' AND ', $item).' )';
     }
 
     /**
@@ -423,7 +423,7 @@ 
             $item[] = $this->parseWhereItem($query, $k, $value, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' OR ', $item) . ' )';
+        return ' '.$logic.' ( '.implode(' OR ', $item).' )';
     }
 
     /**
@@ -441,7 +441,7 @@ 
         $whereClause = $this->buildWhere($query, $newQuery->getOptions('where') ?: []);
 
         if (!empty($whereClause)) {
-            $where = ' ' . $logic . ' ( ' . $whereClause . ' )';
+            $where = ' '.$logic.' ( '.$whereClause.' )';
         }
 
         return $where ?? '';
@@ -466,7 +466,7 @@ 
             $where[] = $this->parseWhereItem($query, array_shift($item), $item, $binds);
         }
 
-        return ' ' . $logic . ' ( ' . implode(' AND ', $where) . ' )';
+        return ' '.$logic.' ( '.implode(' AND ', $where).' )';
     }
 
     /**
@@ -487,7 +487,7 @@ 
 
         // 检测操作符
         if (!is_string($exp)) {
-            throw new Exception('where express error:' . var_export($exp, true));
+            throw new Exception('where express error:'.var_export($exp, true));
         }
 
         $exp = strtoupper($exp);
@@ -512,7 +512,7 @@ 
             if (is_string($value) && 0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bindValue($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -523,7 +523,7 @@ 
             }
         }
 
-        throw new Exception('where express error:' . $exp);
+        throw new Exception('where express error:'.$exp);
     }
 
     /**
@@ -545,12 +545,12 @@ 
             $array = [];
             foreach ($value as $item) {
                 $name    = $query->bindValue($item, PDO::PARAM_STR);
-                $array[] = $key . ' ' . $exp . ' :' . $name;
+                $array[] = $key.' '.$exp.' :'.$name;
             }
 
-            $whereStr = '(' . implode(' ' . strtoupper($logic) . ' ', $array) . ')';
+            $whereStr = '('.implode(' '.strtoupper($logic).' ', $array).')';
         } else {
-            $whereStr = $key . ' ' . $exp . ' ' . $value;
+            $whereStr = $key.' '.$exp.' '.$value;
         }
 
         return $whereStr;
@@ -570,7 +570,7 @@ 
     protected function parseExp(Query $query, string $key, string $exp, Raw $value, string $field, int $bindType): string
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -590,10 +590,10 @@ 
         list($op, $field) = $value;
 
         if (!in_array(trim($op), ['=', '<>', '>', '>=', '<', '<='])) {
-            throw new Exception('where express error:' . var_export($value, true));
+            throw new Exception('where express error:'.var_export($value, true));
         }
 
-        return '( ' . $key . ' ' . $op . ' ' . $this->parseKey($query, $field, true) . ' )';
+        return '( '.$key.' '.$op.' '.$this->parseKey($query, $field, true).' )';
     }
 
     /**
@@ -610,7 +610,7 @@ 
     protected function parseNull(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -632,7 +632,7 @@ 
         $min = $query->bindValue($data[0], $bindType);
         $max = $query->bindValue($data[1], $bindType);
 
-        return $key . ' ' . $exp . ' :' . $min . ' AND :' . $max . ' ';
+        return $key.' '.$exp.' :'.$min.' AND :'.$max.' ';
     }
 
     /**
@@ -654,10 +654,10 @@ 
         } elseif ($value instanceof Raw) {
             $value = $value->getValue();
         } else {
-            throw new Exception('where express error:' . $value);
+            throw new Exception('where express error:'.$value);
         }
 
-        return $exp . ' ( ' . $value . ' )';
+        return $exp.' ( '.$value.' )';
     }
 
     /**
@@ -673,7 +673,7 @@ 
      */
     protected function parseTime(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
-        return $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($query, $value, $field, $bindType);
+        return $key.' '.substr($exp, 0, 2).' '.$this->parseDateTime($query, $value, $field, $bindType);
     }
 
     /**
@@ -690,7 +690,7 @@ 
     protected function parseCompare(Query $query, string $key, string $exp, $value, $field, int $bindType): string
     {
         if (is_array($value)) {
-            throw new Exception('where express error:' . $exp . var_export($value, true));
+            throw new Exception('where express error:'.$exp.var_export($value, true));
         }
 
         // 比较运算
@@ -699,10 +699,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -722,7 +722,7 @@ 
             $value = explode(',', $value);
         }
 
-        return $key . ' ' . substr($exp, 0, -4)
+        return $key.' '.substr($exp, 0, -4)
         . $this->parseDateTime($query, $value[0], $field, $bindType)
         . ' AND '
         . $this->parseDateTime($query, $value[1], $field, $bindType);
@@ -753,18 +753,18 @@ 
 
             foreach ($value as $v) {
                 $name    = $query->bindValue($v, $bindType);
-                $array[] = ':' . $name;
+                $array[] = ':'.$name;
             }
 
             if (count($array) == 1) {
-                return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
+                return $key.('IN' == $exp ? ' = ' : ' <> ').$array[0];
             } else {
                 $zone  = implode(',', $array);
                 $value = empty($zone) ? "''" : $zone;
             }
         }
 
-        return $key . ' ' . $exp . ' (' . $value . ')';
+        return $key.' '.$exp.' ('.$value.')';
     }
 
     /**
@@ -827,7 +827,7 @@ 
 
         $name = $query->bindValue($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -839,7 +839,7 @@ 
      */
     protected function parseLimit(Query $query, string $limit): string
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -859,14 +859,14 @@ 
             if (strpos($on, '=')) {
                 list($val1, $val2) = explode('=', $on, 2);
 
-                $condition = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
+                $condition = $this->parseKey($query, $val1).'='.$this->parseKey($query, $val2);
             } else {
                 $condition = $on;
             }
 
             $table = $this->parseTable($query, $table);
 
-            $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . $condition;
+            $joinStr .= ' '.$type.' JOIN '.$table.' ON '.$condition;
         }
 
         return $joinStr;
@@ -891,22 +891,22 @@ 
                 $array[] = $this->parseRand($query);
             } elseif (is_string($val)) {
                 if (is_numeric($key)) {
-                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
+                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val.' ');
                 } else {
                     $sort = $val;
                 }
 
                 if (preg_match('/^[\w\.]+$/', $key)) {
                     $sort    = strtoupper($sort);
-                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
-                    $array[] = $this->parseKey($query, $key, true) . $sort;
+                    $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
+                    $array[] = $this->parseKey($query, $key, true).$sort;
                 } else {
-                    throw new Exception('order express error:' . $key);
+                    throw new Exception('order express error:'.$key);
                 }
             }
         }
 
-        return empty($array) ? '' : ' ORDER BY ' . implode(',', $array);
+        return empty($array) ? '' : ' ORDER BY '.implode(',', $array);
     }
 
     /**
@@ -938,14 +938,14 @@ 
         }
 
         $sort = strtoupper($sort);
-        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
         $bind = $query->getFieldsBindType();
 
         foreach ($val as $item) {
             $val[] = $this->parseDataBind($query, $key, $item, $bind);
         }
 
-        return 'field(' . $this->parseKey($query, $key, true) . ',' . implode(',', $val) . ')' . $sort;
+        return 'field('.$this->parseKey($query, $key, true).','.implode(',', $val).')'.$sort;
     }
 
     /**
@@ -970,7 +970,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -982,7 +982,7 @@ 
      */
     protected function parseHaving(Query $query, string $having): string
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -998,7 +998,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -1031,13 +1031,13 @@ 
 
         foreach ($union as $u) {
             if ($u instanceof Closure) {
-                $sql[] = $type . ' ' . $this->parseClosure($query, $u);
+                $sql[] = $type.' '.$this->parseClosure($query, $u);
             } elseif (is_string($u)) {
-                $sql[] = $type . ' ( ' . $u . ' )';
+                $sql[] = $type.' ( '.$u.' )';
             }
         }
 
-        return ' ' . implode(' ', $sql);
+        return ' '.implode(' ', $sql);
     }
 
     /**
@@ -1074,7 +1074,7 @@ 
         }
 
         if (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         } else {
             return '';
         }
@@ -1171,7 +1171,7 @@ 
         foreach ($dataSet as $k => $data) {
             $data = $this->parseData($query, $data, $allowFields, $bind);
 
-            $values[] = 'SELECT ' . implode(',', array_values($data));
+            $values[] = 'SELECT '.implode(',', array_values($data));
 
             if (!isset($insertFields)) {
                 $insertFields = array_keys($data);
@@ -1209,7 +1209,7 @@ 
             $field = $this->parseKey($query, $field, true);
         }
 
-        return 'INSERT INTO ' . $this->parseTable($query, $table) . ' (' . implode(',', $fields) . ') ' . $this->select($query);
+        return 'INSERT INTO '.$this->parseTable($query, $table).' ('.implode(',', $fields).') '.$this->select($query);
     }
 
     /**
@@ -1230,7 +1230,7 @@ 
 
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1264,7 +1264,7 @@ 
             [
                 $this->parseTable($query, $options['table']),
                 $this->parseExtra($query, $options['extra']),
-                !empty($options['using']) ? ' USING ' . $this->parseTable($query, $options['using']) . ' ' : '',
+                !empty($options['using']) ? ' USING '.$this->parseTable($query, $options['using']).' ' : '',
                 $this->parseJoin($query, $options['join']),
                 $this->parseWhere($query, $options['where']),
                 $this->parseOrder($query, $options['order']),

src/think/db/Query.php

Spacing +35 added lines, -35 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -161,15 +161,15 @@ 
             $name = App::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:' . static::class . '->' . $method);
+            throw new Exception('method not exist:'.static::class.'->'.$method);
         }
     }
 
@@ -289,7 +289,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . App::parseName($name);
+        return $this->prefix.App::parseName($name);
     }
 
     /**
@@ -559,7 +559,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();
 
@@ -854,10 +854,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;
             }
         }
 
@@ -911,7 +911,7 @@ 
             // 延迟写入
             $condition = $this->options['where'] ?? [];
 
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->connection->lazyWrite($op, $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -970,7 +970,7 @@ 
         $table  = $this->getJoinTable($join, $alias);
 
         if (true === $field) {
-            $fields = $alias . '.*';
+            $fields = $alias.'.*';
         } else {
             if (is_string($field)) {
                 $field = explode(',', $field);
@@ -978,17 +978,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;
                 }
@@ -1041,7 +1041,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];
                     }
                 }
             }
@@ -1351,7 +1351,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) {
@@ -1550,7 +1550,7 @@ 
      */
     public function limit(int $offset, int $length = null)
     {
-        $this->options['limit'] = $offset . ($length ? ',' . $length : '');
+        $this->options['limit'] = $offset.($length ? ','.$length : '');
 
         return $this;
     }
@@ -1746,7 +1746,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
             if (strpos($field, ',')) {
                 $field = array_map('trim', explode(',', $field));
@@ -1756,9 +1756,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]);
                 }
             }
@@ -2132,7 +2132,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);
@@ -2184,7 +2184,7 @@ 
             $op    = 'between';
         }
 
-        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+        return $this->parseWhereExp($logic, $field, strtolower($op).' time', $range, [], true);
     }
 
     /**
@@ -2200,7 +2200,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);
     }
@@ -2256,7 +2256,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);
     }
 
     /**
@@ -2367,7 +2367,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;
@@ -2401,9 +2401,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);
             }
         }
     }
@@ -2564,7 +2564,7 @@ 
             } elseif ($this->model) {
                 // 检测搜索器
                 $fieldName = is_numeric($key) ? $field : $key;
-                $method    = 'search' . App::parseName($fieldName, 1) . 'Attr';
+                $method    = 'search'.App::parseName($fieldName, 1).'Attr';
 
                 if (method_exists($this->model, $method)) {
                     $this->model->$method($this, $data[$field] ?? null, $data, $prefix);
@@ -2611,10 +2611,10 @@ 
                     ->getRelationCountQuery($closure, $aggregate, $field, $aggregateField);
 
                 if (empty($aggregateField)) {
-                    $aggregateField = App::parseName($relation) . '_' . $aggregate;
+                    $aggregateField = App::parseName($relation).'_'.$aggregate;
                 }
 
-                $this->field(['(' . $count . ')' => $aggregateField]);
+                $this->field(['('.$count.')' => $aggregateField]);
             }
         }
 
@@ -3243,11 +3243,11 @@ 
     {
         if (!empty($this->model)) {
             $class = get_class($this->model);
-            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $this->options);
+            throw new ModelNotFoundException('model data Not Found:'.$class, $class, $this->options);
         }
 
         $table = $this->getTable();
-        throw new DataNotFoundException('table data not Found:' . $table, $table, $this->options);
+        throw new DataNotFoundException('table data not Found:'.$table, $table, $this->options);
     }
 
     /**
@@ -3362,7 +3362,7 @@ 
      */
     public function buildSql(bool $sub = true): string
     {
-        return $sub ? '( ' . $this->fetchSql()->select() . ' )' : $this->fetchSql()->select();
+        return $sub ? '( '.$this->fetchSql()->select().' )' : $this->fetchSql()->select();
     }
 
     /**
@@ -3464,7 +3464,7 @@ 
                 $alias = $this->options['alias'][$table];
             }
 
-            $key = isset($alias) ? $alias . '.' . $pk : $pk;
+            $key = isset($alias) ? $alias.'.'.$pk : $pk;
             // 根据主键查询
             if (is_array($data)) {
                 $this->where($key, 'in', $data);
@@ -3528,7 +3528,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows ?: (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;

src/think/db/Connection.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -449,9 +449,9 @@ 
         } else {
             if (true === $key) {
                 if (!empty($query->getOptions('key'))) {
-                    $key = 'think:' . $this->getConfig('database') . '.' . $query->getTable() . '|' . $query->getOptions('key');
+                    $key = 'think:'.$this->getConfig('database').'.'.$query->getTable().'|'.$query->getOptions('key');
                 } else {
-                    $key = md5($this->getConfig('database') . serialize($query->getOptions()));
+                    $key = md5($this->getConfig('database').serialize($query->getOptions()));
                 }
             }
 
@@ -475,15 +475,15 @@ 
      */
     public function lazyWrite(string $type, string $guid, float $step, int $lazyTime)
     {
-        if (!$this->cache->has($guid . '_time')) {
+        if (!$this->cache->has($guid.'_time')) {
             // 计时开始
-            $this->cache->set($guid . '_time', time(), 0);
+            $this->cache->set($guid.'_time', time(), 0);
             $this->cache->$type($guid, $step);
-        } elseif (time() > $this->cache->get($guid . '_time') + $lazyTime) {
+        } elseif (time() > $this->cache->get($guid.'_time') + $lazyTime) {
             // 删除缓存
             $value = $this->cache->$type($guid, $step);
             $this->cache->delete($guid);
-            $this->cache->delete($guid . '_time');
+            $this->cache->delete($guid.'_time');
             return 0 === $value ? false : $value;
         } else {
             // 更新缓存

src/think/db/Fetch.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;
 
@@ -61,7 +61,7 @@ 
     {
         $this->query->parseOptions();
 
-        $field = $aggregate . '(' . $this->builder->parseKey($this->query, $field) . ') AS tp_' . strtolower($aggregate);
+        $field = $aggregate.'('.$this->builder->parseKey($this->query, $field).') AS tp_'.strtolower($aggregate);
 
         return $this->value($field, 0, false);
     }
@@ -111,7 +111,7 @@ 
         }
 
         if ($key && '*' != $field) {
-            $field = $key . ',' . $field;
+            $field = $key.','.$field;
         }
 
         $field = array_map('trim', explode(',', $field));
@@ -421,7 +421,7 @@ 
         if (!empty($options['group'])) {
             // 支持GROUP
             $bind   = $this->query->getBind();
-            $subSql = $this->query->options($options)->field('count(' . $field . ') AS think_count')->bind($bind)->buildSql();
+            $subSql = $this->query->options($options)->field('count('.$field.') AS think_count')->bind($bind)->buildSql();
 
             $query = $this->query->newQuery()->table([$subSql => '_group_count_']);
 

src/think/db/builder/Mysql.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\builder;
 
@@ -123,7 +123,7 @@ 
 
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -168,7 +168,7 @@ 
         foreach ($dataSet as $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);
@@ -211,7 +211,7 @@ 
         }
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -247,7 +247,7 @@ 
                 $this->parseTable($query, $options['table']),
                 $this->parsePartition($query, $options['partition']),
                 $this->parseExtra($query, $options['extra']),
-                !empty($options['using']) ? ' USING ' . $this->parseTable($query, $options['using']) . ' ' : '',
+                !empty($options['using']) ? ' USING '.$this->parseTable($query, $options['using']).' ' : '',
                 $this->parseJoin($query, $options['join']),
                 $this->parseWhere($query, $options['where']),
                 $this->parseOrder($query, $options['order']),
@@ -274,7 +274,7 @@ 
             $value = $value->getValue();
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -293,7 +293,7 @@ 
             $value = $value->getValue();
         }
 
-        return 'FIND_IN_SET(' . $value . ', ' . $key . ')';
+        return 'FIND_IN_SET('.$value.', '.$key.')';
     }
 
     /**
@@ -317,7 +317,7 @@ 
         if (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
-            return 'json_extract(' . $this->parseKey($query, $field) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
+            return 'json_extract('.$this->parseKey($query, $field).', \'$'.(strpos($name, '[') === 0 ? '' : '.').str_replace('->', '.', $name).'\')';
         } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -334,11 +334,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)) {
@@ -346,7 +346,7 @@ 
                 $table = str_replace('.', '`.`', $table);
             }
 
-            $key = '`' . $table . '`.' . $key;
+            $key = '`'.$table.'`.'.$key;
         }
 
         return $key;
@@ -380,7 +380,7 @@ 
             $partition = explode(',', $partition);
         }
 
-        return ' PARTITION (' . implode(' , ', $partition) . ') ';
+        return ' PARTITION ('.implode(' , ', $partition).') ';
     }
 
     /**
@@ -397,7 +397,7 @@ 
         }
 
         if ($duplicate instanceof Raw) {
-            return ' ON DUPLICATE KEY UPDATE ' . $duplicate->getValue() . ' ';
+            return ' ON DUPLICATE KEY UPDATE '.$duplicate->getValue().' ';
         }
 
         if (is_string($duplicate)) {
@@ -408,15 +408,15 @@ 
         foreach ($duplicate as $key => $val) {
             if (is_numeric($key)) {
                 $val       = $this->parseKey($query, $val);
-                $updates[] = $val . ' = VALUES(' . $val . ')';
+                $updates[] = $val.' = VALUES('.$val.')';
             } elseif ($val instanceof Raw) {
-                $updates[] = $this->parseKey($query, $key) . " = " . $val->getValue();
+                $updates[] = $this->parseKey($query, $key)." = ".$val->getValue();
             } else {
                 $name      = $query->bindValue($val, $query->getFieldBindType($key));
-                $updates[] = $this->parseKey($query, $key) . " = :" . $name;
+                $updates[] = $this->parseKey($query, $key)." = :".$name;
             }
         }
 
-        return ' ON DUPLICATE KEY UPDATE ' . implode(' , ', $updates) . ' ';
+        return ' ON DUPLICATE KEY UPDATE '.implode(' , ', $updates).' ';
     }
 }