top-think / framework

library/think/db/builder/Pgsql.php

Spacing +4 added lines, -4 removed lines

@@ -37,9 +37,9 @@ 
         if (!empty($limit)) {
             $limit = explode(',', $limit);
             if (count($limit) > 1) {
-                $limitStr .= ' LIMIT ' . $limit[1] . ' OFFSET ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[1].' OFFSET '.$limit[0].' ';
             } else {
-                $limitStr .= ' LIMIT ' . $limit[0] . ' ';
+                $limitStr .= ' LIMIT '.$limit[0].' ';
             }
         }
 
@@ -67,7 +67,7 @@ 
         if (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key);
-            $key                = $field . '->>\'' . $name . '\'';
+            $key                = $field.'->>\''.$name.'\'';
         } elseif (strpos($key, '.')) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -84,7 +84,7 @@ 
         }
 
         if (isset($table)) {
-            $key = $table . '.' . $key;
+            $key = $table.'.'.$key;
         }
 
         return $key;

library/think/db/Builder.php

Spacing +63 added lines, -63 removed lines

@@ -132,23 +132,23 @@ 
             if (false !== strpos($key, '->')) {
                 list($key, $name) = explode('->', $key);
                 $item             = $this->parseKey($query, $key);
-                $result[$item]    = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key, $val, $bind) . ')';
+                $result[$item]    = 'json_set('.$item.', \'$.'.$name.'\', '.$this->parseDataBind($query, $key, $val, $bind).')';
             } elseif ('*' == $options['field'] && 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;
                     case 'EXP':
-                        throw new Exception('not support data:[' . $val[0] . ']');
+                        throw new Exception('not support data:['.$val[0].']');
                 }
             } elseif (is_scalar($val)) {
                 // 过滤非标量数据
@@ -176,7 +176,7 @@ 
 
         $name = $query->bind($data, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -209,7 +209,7 @@ 
 
             foreach ($fields as $key => $field) {
                 if (!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);
                 }
@@ -236,12 +236,12 @@ 
         foreach ((array) $tables as $key => $table) {
             if (!is_numeric($key)) {
                 $key    = $this->connection->parseSqlTable($key);
-                $item[] = $this->parseKey($query, $key) . ' ' . $this->parseKey($query, $table);
+                $item[] = $this->parseKey($query, $key).' '.$this->parseKey($query, $table);
             } else {
                 $table = $this->connection->parseSqlTable($table);
 
                 if (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);
                 }
@@ -268,11 +268,11 @@ 
             list($field, $condition) = $options['soft_delete'];
 
             $binds    = $this->connection->getFieldsBind($options['table']);
-            $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;
     }
 
     /**
@@ -296,17 +296,17 @@ 
 
             foreach ($val as $value) {
                 if ($value instanceof Expression) {
-                    $str[] = ' ' . $logic . ' ( ' . $value->getValue() . ' )';
+                    $str[] = ' '.$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) {
@@ -316,7 +316,7 @@ 
                     $whereClause = $this->buildWhere($query, $newQuery->getOptions('where'));
 
                     if (!empty($whereClause)) {
-                        $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
+                        $str[] = ' '.$logic.' ( '.$whereClause.' )';
                     }
                 } elseif (is_array($field)) {
                     array_unshift($value, $field);
@@ -325,7 +325,7 @@ 
                         $str2[] = $this->parseWhereItem($query, array_shift($item), $item, $logic, $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $str2) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' AND ', $str2).' )';
                 } elseif (strpos($field, '|')) {
                     // 不同字段使用相同查询条件（OR）
                     $array = explode('|', $field);
@@ -335,7 +335,7 @@ 
                         $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' OR ', $item) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' OR ', $item).' )';
                 } elseif (strpos($field, '&')) {
                     // 不同字段使用相同查询条件（AND）
                     $array = explode('&', $field);
@@ -345,11 +345,11 @@ 
                         $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
                     }
 
-                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $item) . ' )';
+                    $str[] = ' '.$logic.' ( '.implode(' AND ', $item).' )';
                 } else {
                     // 对字段使用表达式查询
                     $field = is_string($field) ? $field : '';
-                    $str[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $logic, $binds);
+                    $str[] = ' '.$logic.' '.$this->parseWhereItem($query, $field, $value, $logic, $binds);
                 }
             }
 
@@ -387,7 +387,7 @@ 
                 $str[] = $this->parseWhereItem($query, $field, $item, $rule, $binds);
             }
 
-            return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
+            return '( '.implode(' '.$rule.' ', $str).' )';
         }
 
         // 检测操作符
@@ -414,7 +414,7 @@ 
             if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bind($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -427,7 +427,7 @@ 
         }
 
         if (!isset($whereStr)) {
-            throw new Exception('where express error:' . $exp);
+            throw new Exception('where express error:'.$exp);
         }
 
         return $whereStr;
@@ -451,12 +451,12 @@ 
         if (is_array($value)) {
             foreach ($value as $item) {
                 $name    = $query->bind($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;
@@ -479,10 +479,10 @@ 
         list($op, $field2) = $value;
 
         if (!in_array($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, $field2, true) . ' )';
+        return '( '.$key.' '.$op.' '.$this->parseKey($query, $field2, true).' )';
     }
 
     /**
@@ -499,7 +499,7 @@ 
     protected function parseExp(Query $query, $key, $exp, Expression $value, $field, $bindType)
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -516,7 +516,7 @@ 
     protected function parseNull(Query $query, $key, $exp, $value, $field, $bindType)
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -538,7 +538,7 @@ 
         $min = $query->bind($data[0], $bindType);
         $max = $query->bind($data[1], $bindType);
 
-        return $key . ' ' . $exp . ' :' . $min . ' AND :' . $max . ' ';
+        return $key.' '.$exp.' :'.$min.' AND :'.$max.' ';
     }
 
     /**
@@ -560,10 +560,10 @@ 
         } elseif ($value instanceof Expression) {
             $value = $value->getValue();
         } else {
-            throw new Exception('where express error:' . $value);
+            throw new Exception('where express error:'.$value);
         }
 
-        return $exp . ' (' . $value . ')';
+        return $exp.' ('.$value.')';
     }
 
     /**
@@ -579,7 +579,7 @@ 
      */
     protected function parseTime(Query $query, $key, $exp, $value, $field, $bindType)
     {
-        return $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($query, $value, $field, $bindType);
+        return $key.' '.substr($exp, 0, 2).' '.$this->parseDateTime($query, $value, $field, $bindType);
     }
 
     /**
@@ -596,7 +596,7 @@ 
     protected function parseCompare(Query $query, $key, $exp, $value, $field, $bindType)
     {
         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));
         }
 
         // 比较运算
@@ -605,10 +605,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -628,7 +628,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);
@@ -659,18 +659,18 @@ 
 
             foreach ($value as $k => $v) {
                 $name    = $query->bind($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.')';
     }
 
     /**
@@ -735,7 +735,7 @@ 
 
         $name = $query->bind($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -747,7 +747,7 @@ 
      */
     protected function parseLimit(Query $query, $limit)
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -773,7 +773,7 @@ 
                     } elseif (strpos($val, '=')) {
                         list($val1, $val2) = explode('=', $val, 2);
 
-                        $condition[] = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
+                        $condition[] = $this->parseKey($query, $val1).'='.$this->parseKey($query, $val2);
                     } else {
                         $condition[] = $val;
                     }
@@ -781,7 +781,7 @@ 
 
                 $table = $this->parseTable($query, $table);
 
-                $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . implode(' AND ', $condition);
+                $joinStr .= ' '.$type.' JOIN '.$table.' ON '.implode(' AND ', $condition);
             }
         }
 
@@ -806,22 +806,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);
     }
 
     /**
@@ -842,7 +842,7 @@ 
         }
 
         $sort = strtoupper($sort);
-        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' '.$sort : '';
 
         $options = $query->getOptions();
         $bind    = $this->connection->getFieldsBind($options['table']);
@@ -851,7 +851,7 @@ 
             $val[$k] = $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;
     }
 
     /**
@@ -875,7 +875,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -887,7 +887,7 @@ 
      */
     protected function parseHaving(Query $query, $having)
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -903,7 +903,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -936,13 +936,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 . ' ( ' . $this->connection->parseSqlTable($u) . ' )';
+                $sql[] = $type.' ( '.$this->connection->parseSqlTable($u).' )';
             }
         }
 
-        return ' ' . implode(' ', $sql);
+        return ' '.implode(' ', $sql);
     }
 
     /**
@@ -973,7 +973,7 @@ 
         if (is_bool($lock)) {
             return $lock ? ' FOR UPDATE ' : '';
         } elseif (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         }
     }
 
@@ -1064,7 +1064,7 @@ 
         foreach ($dataSet as $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);
@@ -1107,7 +1107,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);
     }
 
     /**
@@ -1127,7 +1127,7 @@ 
         }
 
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1159,7 +1159,7 @@ 
             ['%TABLE%', '%USING%', '%JOIN%', '%WHERE%', '%ORDER%', '%LIMIT%', '%LOCK%', '%COMMENT%'],
             [
                 $this->parseTable($query, $options['table']),
-                !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']),

library/think/db/Connection.php

Spacing +24 added lines, -25 removed lines

@@ -189,7 +189,7 @@ 
             }
 
             // 记录初始化信息
-            Container::get('app')->log('[ DB ] INIT ' . $config['type']);
+            Container::get('app')->log('[ DB ] INIT '.$config['type']);
 
             if (true === $name) {
                 $name = md5(serialize($config));
@@ -212,7 +212,7 @@ 
             return $this->builderClassName;
         }
 
-        return $this->getConfig('builder') ?: '\\think\\db\\builder\\' . ucfirst($this->getConfig('type'));
+        return $this->getConfig('builder') ?: '\\think\\db\\builder\\'.ucfirst($this->getConfig('type'));
     }
 
     /**
@@ -326,8 +326,8 @@ 
     public function parseSqlTable($sql)
     {
         if (false !== strpos($sql, '__')) {
-            $sql = preg_replace_callback("/__([A-Z0-9_-]+)__/sU", function ($match) {
-                return $this->getConfig('prefix') . strtolower($match[1]);
+            $sql = preg_replace_callback("/__([A-Z0-9_-]+)__/sU", function($match) {
+                return $this->getConfig('prefix').strtolower($match[1]);
             }, $sql);
         }
 
@@ -362,14 +362,14 @@ 
         list($tableName) = explode(' ', $tableName);
 
         if (false === strpos($tableName, '.')) {
-            $schema = $this->getConfig('database') . '.' . $tableName;
+            $schema = $this->getConfig('database').'.'.$tableName;
         } else {
             $schema = $tableName;
         }
 
         if (!isset(self::$info[$schema])) {
             // 读取缓存
-            $cacheFile = Container::get('app')->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR . $schema . '.php';
+            $cacheFile = Container::get('app')->getRuntimePath().'schema'.DIRECTORY_SEPARATOR.$schema.'.php';
 
             if (!$this->config['debug'] && is_file($cacheFile)) {
                 $info = include $cacheFile;
@@ -378,7 +378,7 @@ 
             }
 
             $fields = array_keys($info);
-            $bind   = $type   = [];
+            $bind   = $type = [];
 
             foreach ($info as $key => $val) {
                 // 记录字段类型
@@ -529,7 +529,7 @@ 
 
             if ($config['debug']) {
                 // 记录数据库连接信息
-                $this->log('[ DB ] CONNECT:[ UseTime:' . number_format(microtime(true) - $startTime, 6) . 's ] ' . $config['dsn']);
+                $this->log('[ DB ] CONNECT:[ UseTime:'.number_format(microtime(true) - $startTime, 6).'s ] '.$config['dsn']);
             }
 
             return $this->links[$linkNum];
@@ -1322,7 +1322,7 @@ 
             list($distinct, $field) = explode(' ', $field);
         }
 
-        $field = $aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $this->builder->parseKey($query, $field, true) . ') AS tp_' . strtolower($aggregate);
+        $field = $aggregate.'('.(!empty($distinct) ? 'DISTINCT ' : '').$this->builder->parseKey($query, $field, true).') AS tp_'.strtolower($aggregate);
 
         return $this->value($query, $field, 0, false);
     }
@@ -1468,15 +1468,14 @@ 
             $type  = is_array($val) ? $val[1] : PDO::PARAM_STR;
 
             if ((self::PARAM_FLOAT == $type || PDO::PARAM_STR == $type) && is_string($value)) {
-                $value = '\'' . addslashes($value) . '\'';
+                $value = '\''.addslashes($value).'\'';
             } elseif (PDO::PARAM_INT == $type && '' === $value) {
                 $value = 0;
             }
 
             // 判断占位符
             $sql = is_numeric($key) ?
-            substr_replace($sql, $value, strpos($sql, '?'), 1) :
-            substr_replace($sql, $value, strpos($sql, ':' . $key), strlen(':' . $key));
+            substr_replace($sql, $value, strpos($sql, '?'), 1) : substr_replace($sql, $value, strpos($sql, ':'.$key), strlen(':'.$key));
         }
 
         return rtrim($sql);
@@ -1495,7 +1494,7 @@ 
     {
         foreach ($bind as $key => $val) {
             // 占位符
-            $param = is_int($key) ? $key + 1 : ':' . $key;
+            $param = is_int($key) ? $key + 1 : ':'.$key;
 
             if (is_array($val)) {
                 if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
@@ -1531,7 +1530,7 @@ 
     protected function bindParam($bind)
     {
         foreach ($bind as $key => $val) {
-            $param = is_int($key) ? $key + 1 : ':' . $key;
+            $param = is_int($key) ? $key + 1 : ':'.$key;
 
             if (is_array($val)) {
                 array_unshift($val, $param);
@@ -1687,7 +1686,7 @@ 
                 $this->linkID->beginTransaction();
             } elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
                 $this->linkID->exec(
-                    $this->parseSavepoint('trans' . $this->transTimes)
+                    $this->parseSavepoint('trans'.$this->transTimes)
                 );
             }
         } catch (\Exception $e) {
@@ -1730,7 +1729,7 @@ 
             $this->linkID->rollBack();
         } elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
             $this->linkID->exec(
-                $this->parseSavepointRollBack('trans' . $this->transTimes)
+                $this->parseSavepointRollBack('trans'.$this->transTimes)
             );
         }
 
@@ -1754,7 +1753,7 @@ 
      */
     protected function parseSavepoint($name)
     {
-        return 'SAVEPOINT ' . $name;
+        return 'SAVEPOINT '.$name;
     }
 
     /**
@@ -1765,7 +1764,7 @@ 
      */
     protected function parseSavepointRollBack($name)
     {
-        return 'ROLLBACK TO SAVEPOINT ' . $name;
+        return 'ROLLBACK TO SAVEPOINT '.$name;
     }
 
     /**
@@ -1900,13 +1899,13 @@ 
     {
         if ($this->PDOStatement) {
             $error = $this->PDOStatement->errorInfo();
-            $error = $error[1] . ':' . $error[2];
+            $error = $error[1].':'.$error[2];
         } else {
             $error = '';
         }
 
         if ('' != $this->queryStr) {
-            $error .= "\n [ SQL语句 ] : " . $this->getLastsql();
+            $error .= "\n [ SQL语句 ] : ".$this->getLastsql();
         }
 
         return $error;
@@ -1983,10 +1982,10 @@ 
             }
 
             // 未注册监听则记录到日志中
-            $this->log('[ SQL ] ' . $sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]');
+            $this->log('[ SQL ] '.$sql.' [ '.$master.'RunTime:'.$runtime.'s ]');
 
             if (!empty($explain)) {
-                $this->log('[ EXPLAIN : ' . var_export($explain, true) . ' ]');
+                $this->log('[ EXPLAIN : '.var_export($explain, true).' ]');
             }
         }
     }
@@ -2136,14 +2135,14 @@ 
             $data = $value[2];
         }
 
-        $prefix = 'think:' . $this->getConfig('database') . '.';
+        $prefix = 'think:'.$this->getConfig('database').'.';
 
         if (isset($data)) {
-            return $prefix . $query->getTable() . '|' . $data;
+            return $prefix.$query->getTable().'|'.$data;
         }
 
         try {
-            return md5($prefix . serialize($query->getOptions()) . serialize($query->getBind(false)));
+            return md5($prefix.serialize($query->getOptions()).serialize($query->getBind(false)));
         } catch (\Exception $e) {
             throw new Exception('closure not support cache(true)');
         }

Braces +3 added lines, -1 removed lines

@@ -1812,9 +1812,11 @@
 
         if ($this->config['rw_separate']) {
             // 主从式采用读写分离
-            if ($master) // 主服务器写入
+            if ($master) {
+                // 主服务器写入
             {
                 $r = $m;
+            }
             } elseif (is_numeric($this->config['slave_no'])) {
                 // 指定服务器读
                 $r = $this->config['slave_no'];

library/think/db/connector/Sqlsrv.php

Spacing +3 added lines, -3 removed lines

@@ -38,10 +38,10 @@ 
      */
     protected function parseDsn($config)
     {
-        $dsn = 'sqlsrv:Database=' . $config['database'] . ';Server=' . $config['hostname'];
+        $dsn = 'sqlsrv:Database='.$config['database'].';Server='.$config['hostname'];
 
         if (!empty($config['hostport'])) {
-            $dsn .= ',' . $config['hostport'];
+            $dsn .= ','.$config['hostport'];
         }
 
         return $dsn;
@@ -160,7 +160,7 @@ 
         if (is_null($field)) {
             $field = '*';
         } elseif ($key && '*' != $field) {
-            $field = $key . ',' . $field;
+            $field = $key.','.$field;
         }
 
         if (is_string($field)) {

library/think/db/connector/Sqlite.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
      */
     protected function parseDsn($config)
     {
-        $dsn = 'sqlite:' . $config['database'];
+        $dsn = 'sqlite:'.$config['database'];
 
         return $dsn;
     }
@@ -44,7 +44,7 @@ 
     public function getFields($tableName)
     {
         list($tableName) = explode(' ', $tableName);
-        $sql             = 'PRAGMA table_info( ' . $tableName . ' )';
+        $sql             = 'PRAGMA table_info( '.$tableName.' )';
 
         $pdo    = $this->query($sql, [], false, true);
         $result = $pdo->fetchAll(PDO::FETCH_ASSOC);

library/think/db/connector/Pgsql.php

Spacing +3 added lines, -3 removed lines

@@ -37,10 +37,10 @@ 
      */
     protected function parseDsn($config)
     {
-        $dsn = 'pgsql:dbname=' . $config['database'] . ';host=' . $config['hostname'];
+        $dsn = 'pgsql:dbname='.$config['database'].';host='.$config['hostname'];
 
         if (!empty($config['hostport'])) {
-            $dsn .= ';port=' . $config['hostport'];
+            $dsn .= ';port='.$config['hostport'];
         }
 
         return $dsn;
@@ -55,7 +55,7 @@ 
     public function getFields($tableName)
     {
         list($tableName) = explode(' ', $tableName);
-        $sql             = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\'' . $tableName . '\');';
+        $sql             = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\''.$tableName.'\');';
 
         $pdo    = $this->query($sql, [], false, true);
         $result = $pdo->fetchAll(PDO::FETCH_ASSOC);

library/think/Debug.php

Spacing +10 added lines, -10 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function getThroughputRate()
     {
-        return number_format(1 / $this->getUseTime(), 2) . 'req/s';
+        return number_format(1 / $this->getUseTime(), 2).'req/s';
     }
 
     /**
@@ -135,7 +135,7 @@ 
             $pos++;
         }
 
-        return round($size, $dec) . " " . $a[$pos];
+        return round($size, $dec)." ".$a[$pos];
     }
 
     /**
@@ -155,7 +155,7 @@ 
             $pos++;
         }
 
-        return round($size, $dec) . " " . $a[$pos];
+        return round($size, $dec)." ".$a[$pos];
     }
 
     /**
@@ -181,7 +181,7 @@ 
             $pos++;
         }
 
-        return round($size, $dec) . " " . $a[$pos];
+        return round($size, $dec)." ".$a[$pos];
     }
 
     /**
@@ -197,7 +197,7 @@ 
             $info  = [];
 
             foreach ($files as $key => $file) {
-                $info[] = $file . ' ( ' . number_format(filesize($file) / 1024, 2) . ' KB )';
+                $info[] = $file.' ( '.number_format(filesize($file) / 1024, 2).' KB )';
             }
 
             return $info;
@@ -217,7 +217,7 @@ 
      */
     public function dump($var, $echo = true, $label = null, $flags = ENT_SUBSTITUTE)
     {
-        $label = (null === $label) ? '' : rtrim($label) . ':';
+        $label = (null === $label) ? '' : rtrim($label).':';
         if ($var instanceof Model || $var instanceof ModelCollection) {
             $var = $var->toArray();
         }
@@ -229,12 +229,12 @@ 
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
 
         if (PHP_SAPI == 'cli') {
-            $output = PHP_EOL . $label . $output . PHP_EOL;
+            $output = PHP_EOL.$label.$output.PHP_EOL;
         } else {
             if (!extension_loaded('xdebug')) {
                 $output = htmlspecialchars($output, $flags);
             }
-            $output = '<pre>' . $label . $output . '</pre>';
+            $output = '<pre>'.$label.$output.'</pre>';
         }
         if ($echo) {
             echo($output);
@@ -260,9 +260,9 @@ 
                 // trace调试信息注入
                 $pos = strripos($content, '</body>');
                 if (false !== $pos) {
-                    $content = substr($content, 0, $pos) . $output . substr($content, $pos);
+                    $content = substr($content, 0, $pos).$output.substr($content, $pos);
                 } else {
-                    $content = $content . $output;
+                    $content = $content.$output;
                 }
             }
         }

library/think/Config.php

Spacing +7 added lines, -7 removed lines

@@ -117,8 +117,8 @@ 
     {
         if (is_file($file)) {
             $filename = $file;
-        } elseif (is_file($this->path . $file . $this->ext)) {
-            $filename = $this->path . $file . $this->ext;
+        } elseif (is_file($this->path.$file.$this->ext)) {
+            $filename = $this->path.$file.$this->ext;
         }
 
         if (isset($filename)) {
@@ -139,7 +139,7 @@ 
     protected function getYaconfName($name)
     {
         if ($this->yaconf && is_string($this->yaconf)) {
-            return $this->yaconf . '.' . $name;
+            return $this->yaconf.'.'.$name;
         }
 
         return $name;
@@ -188,7 +188,7 @@ 
     public function has($name)
     {
         if (false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         return !is_null($this->get($name));
@@ -226,7 +226,7 @@ 
     public function get($name = null, $default = null)
     {
         if ($name && false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         // 无参数时获取所有
@@ -273,7 +273,7 @@ 
     {
         if (is_string($name)) {
             if (false === strpos($name, '.')) {
-                $name = $this->prefix . '.' . $name;
+                $name = $this->prefix.'.'.$name;
             }
 
             $name = explode('.', $name, 3);
@@ -315,7 +315,7 @@ 
     public function remove($name)
     {
         if (false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         $name = explode('.', $name, 3);

library/think/paginator/driver/Bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
      */
     protected function getAvailablePageWrapper($url, $page)
     {
-        return '<li><a href="' . htmlentities($url) . '">' . $page . '</a></li>';
+        return '<li><a href="'.htmlentities($url).'">'.$page.'</a></li>';
     }
 
     /**
@@ -147,7 +147,7 @@ 
      */
     protected function getDisabledTextWrapper($text)
     {
-        return '<li class="disabled"><span>' . $text . '</span></li>';
+        return '<li class="disabled"><span>'.$text.'</span></li>';
     }
 
     /**
@@ -158,7 +158,7 @@ 
      */
     protected function getActivePageWrapper($text)
     {
-        return '<li class="active"><span>' . $text . '</span></li>';
+        return '<li class="active"><span>'.$text.'</span></li>';
     }
 
     /**