top-think / framework

library/think/model/relation/OneToOne.php

Spacing +4 added lines, -4 removed lines

@@ -83,9 +83,9 @@ 
         $query->via($joinAlias);
 
         if ($this instanceof BelongsTo) {
-            $joinOn = $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey;
+            $joinOn = $name.'.'.$this->foreignKey.'='.$joinAlias.'.'.$this->localKey;
         } else {
-            $joinOn = $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey;
+            $joinOn = $name.'.'.$this->localKey.'='.$joinAlias.'.'.$this->foreignKey;
         }
 
         if ($closure instanceof Closure) {
@@ -100,7 +100,7 @@ 
         }
 
         $query->join([$joinTable => $joinAlias], $joinOn, $joinType)
-            ->field($field, false, $joinTable, $joinAlias, $relation . '__');
+            ->field($field, false, $joinTable, $joinAlias, $relation.'__');
     }
 
     /**
@@ -292,7 +292,7 @@ 
         foreach ($this->bindAttr as $key => $attr) {
             $key = is_numeric($key) ? $attr : $key;
             if (isset($result->$key)) {
-                throw new Exception('bind attr has exists:' . $key);
+                throw new Exception('bind attr has exists:'.$key);
             } else {
                 $result->setAttr($key, $model ? $model->$attr : null);
             }

library/think/session/driver/Redis.php

Spacing +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
      */
     public function read($sessID)
     {
-        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+        return (string) $this->handler->get($this->config['session_name'].$sessID);
     }
 
     /**
@@ -108,9 +108,9 @@ 
     public function write($sessID, $sessData)
     {
         if ($this->config['expire'] > 0) {
-            $result = $this->handler->setex($this->config['session_name'] . $sessID, $this->config['expire'], $sessData);
+            $result = $this->handler->setex($this->config['session_name'].$sessID, $this->config['expire'], $sessData);
         } else {
-            $result = $this->handler->set($this->config['session_name'] . $sessID, $sessData);
+            $result = $this->handler->set($this->config['session_name'].$sessID, $sessData);
         }
 
         return $result ? true : false;
@@ -124,7 +124,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->del($this->config['session_name'] . $sessID) > 0;
+        return $this->handler->del($this->config['session_name'].$sessID) > 0;
     }
 
     /**
@@ -151,7 +151,7 @@ 
             $this->open('', '');
         }
 
-        $lockKey = 'LOCK_PREFIX_' . $sessID;
+        $lockKey = 'LOCK_PREFIX_'.$sessID;
         // 使用setnx操作加锁
         $isLock = $this->handler->setnx($lockKey, 1);
         if ($isLock) {
@@ -174,6 +174,6 @@ 
             $this->open('', '');
         }
 
-        $this->handler->del('LOCK_PREFIX_' . $sessID);
+        $this->handler->del('LOCK_PREFIX_'.$sessID);
     }
 }

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) {
@@ -317,7 +317,7 @@ 
 
                     if (!empty($whereClause)) {
                         $query->bind($newQuery->getBind(false));
-                        $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
+                        $str[] = ' '.$logic.' ( '.$whereClause.' )';
                     }
                 } elseif (is_array($field)) {
                     array_unshift($value, $field);
@@ -326,7 +326,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);
@@ -336,7 +336,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);
@@ -346,11 +346,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);
                 }
             }
 
@@ -388,7 +388,7 @@ 
                 $str[] = $this->parseWhereItem($query, $field, $item, $rule, $binds);
             }
 
-            return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
+            return '( '.implode(' '.$rule.' ', $str).' )';
         }
 
         // 检测操作符
@@ -415,7 +415,7 @@ 
             if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
             } else {
                 $name  = $query->bind($value, $bindType);
-                $value = ':' . $name;
+                $value = ':'.$name;
             }
         }
 
@@ -428,7 +428,7 @@ 
         }
 
         if (!isset($whereStr)) {
-            throw new Exception('where express error:' . $exp);
+            throw new Exception('where express error:'.$exp);
         }
 
         return $whereStr;
@@ -452,12 +452,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;
@@ -480,10 +480,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).' )';
     }
 
     /**
@@ -500,7 +500,7 @@ 
     protected function parseExp(Query $query, $key, $exp, Expression $value, $field, $bindType)
     {
         // 表达式查询
-        return '( ' . $key . ' ' . $value->getValue() . ' )';
+        return '( '.$key.' '.$value->getValue().' )';
     }
 
     /**
@@ -517,7 +517,7 @@ 
     protected function parseNull(Query $query, $key, $exp, $value, $field, $bindType)
     {
         // NULL 查询
-        return $key . ' IS ' . $exp;
+        return $key.' IS '.$exp;
     }
 
     /**
@@ -539,7 +539,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.' ';
     }
 
     /**
@@ -561,10 +561,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.')';
     }
 
     /**
@@ -580,7 +580,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);
     }
 
     /**
@@ -597,7 +597,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));
         }
 
         // 比较运算
@@ -606,10 +606,10 @@ 
         }
 
         if ('=' == $exp && is_null($value)) {
-            return $key . ' IS NULL';
+            return $key.' IS NULL';
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -629,7 +629,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);
@@ -660,18 +660,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.')';
     }
 
     /**
@@ -736,7 +736,7 @@ 
 
         $name = $query->bind($value, $bindType);
 
-        return ':' . $name;
+        return ':'.$name;
     }
 
     /**
@@ -748,7 +748,7 @@ 
      */
     protected function parseLimit(Query $query, $limit)
     {
-        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT '.$limit.' ' : '';
     }
 
     /**
@@ -774,7 +774,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;
                     }
@@ -782,7 +782,7 @@ 
 
                 $table = $this->parseTable($query, $table);
 
-                $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . implode(' AND ', $condition);
+                $joinStr .= ' '.$type.' JOIN '.$table.' ON '.implode(' AND ', $condition);
             }
         }
 
@@ -807,22 +807,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);
     }
 
     /**
@@ -843,7 +843,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']);
@@ -852,7 +852,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;
     }
 
     /**
@@ -876,7 +876,7 @@ 
             $val[] = $this->parseKey($query, $key);
         }
 
-        return ' GROUP BY ' . implode(',', $val);
+        return ' GROUP BY '.implode(',', $val);
     }
 
     /**
@@ -888,7 +888,7 @@ 
      */
     protected function parseHaving(Query $query, $having)
     {
-        return !empty($having) ? ' HAVING ' . $having : '';
+        return !empty($having) ? ' HAVING '.$having : '';
     }
 
     /**
@@ -904,7 +904,7 @@ 
             $comment = strstr($comment, '*/', true);
         }
 
-        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+        return !empty($comment) ? ' /* '.$comment.' */' : '';
     }
 
     /**
@@ -937,13 +937,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);
     }
 
     /**
@@ -974,7 +974,7 @@ 
         if (is_bool($lock)) {
             return $lock ? ' FOR UPDATE ' : '';
         } elseif (is_string($lock) && !empty($lock)) {
-            return ' ' . trim($lock) . ' ';
+            return ' '.trim($lock).' ';
         }
     }
 
@@ -1065,7 +1065,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);
@@ -1108,7 +1108,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);
     }
 
     /**
@@ -1128,7 +1128,7 @@ 
         }
 
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -1160,7 +1160,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/Query.php

Spacing +41 added lines, -41 removed lines

@@ -181,15 +181,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);
         }
     }
 
@@ -308,7 +308,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . Loader::parseName($name);
+        return $this->prefix.Loader::parseName($name);
     }
 
     /**
@@ -580,16 +580,16 @@ 
                         $seq = (ord($value{0}) % $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];
     }
 
     /**
@@ -655,7 +655,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();
 
@@ -758,7 +758,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) {
@@ -791,7 +791,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) {
@@ -822,15 +822,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 {
             // 更新缓存
@@ -1029,10 +1029,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;
                 }
             }
         }
@@ -1159,7 +1159,7 @@ 
             $table  = $this->getJoinTable($join, $alias);
 
             if (true === $field) {
-                $fields = $alias . '.*';
+                $fields = $alias.'.*';
             } else {
                 if (is_string($field)) {
                     $field = explode(',', $field);
@@ -1167,17 +1167,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;
                     }
@@ -1490,9 +1490,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);
             }
         }
     }
@@ -1536,7 +1536,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) {
@@ -1720,7 +1720,7 @@ 
             list($offset, $length) = explode(',', $offset);
         }
 
-        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+        $this->options['limit'] = intval($offset).($length ? ','.intval($length) : '');
 
         return $this;
     }
@@ -1777,7 +1777,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',
@@ -1887,7 +1887,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
 
             if (strpos($field, ',')) {
@@ -1898,9 +1898,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]);
                 }
             }
@@ -2312,7 +2312,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);
@@ -2339,7 +2339,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);
@@ -2404,7 +2404,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);
     }
 
     /**
@@ -2482,7 +2482,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;
@@ -2699,10 +2699,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]);
             }
         }
 
@@ -3421,10 +3421,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);
     }
 
     /**
@@ -3560,7 +3560,7 @@ 
      */
     public function buildSql($sub = true)
     {
-        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+        return $sub ? '( '.$this->select(false).' )' : $this->select(false);
     }
 
     /**
@@ -3631,7 +3631,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];
@@ -3642,7 +3642,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');
@@ -3718,7 +3718,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/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)) {
@@ -369,12 +369,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);
                     unset($vars[$key]);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
-                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/[:'.$key.']', '[:'.$key.']', '<'.$key.'?>'], '', $url);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {

library/think/cache/driver/File.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
         }
 
         if (empty($this->options['path'])) {
-            $this->options['path'] = Container::get('app')->getRuntimePath() . 'cache' . DIRECTORY_SEPARATOR;
+            $this->options['path'] = Container::get('app')->getRuntimePath().'cache'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->options['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -82,14 +82,14 @@ 
 
         if ($this->options['cache_subdir']) {
             // 使用子目录
-            $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2);
+            $name = substr($name, 0, 2).DIRECTORY_SEPARATOR.substr($name, 2);
         }
 
         if ($this->options['prefix']) {
-            $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
+            $name = $this->options['prefix'].DIRECTORY_SEPARATOR.$name;
         }
 
-        $filename = $this->options['path'] . $name . '.php';
+        $filename = $this->options['path'].$name.'.php';
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {
@@ -184,7 +184,7 @@ 
             $data = gzcompress($data, 3);
         }
 
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
         $result = file_put_contents($filename, $data);
 
         if ($result) {
@@ -272,13 +272,13 @@ 
 
         $this->writeTimes++;
 
-        $files = (array) glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DIRECTORY_SEPARATOR : '') . '*');
+        $files = (array) glob($this->options['path'].($this->options['prefix'] ? $this->options['prefix'].DIRECTORY_SEPARATOR : '').'*');
 
         foreach ($files as $path) {
             if (is_dir($path)) {
-                $matches = glob($path . DIRECTORY_SEPARATOR . '*.php');
+                $matches = glob($path.DIRECTORY_SEPARATOR.'*.php');
                 if (is_array($matches)) {
-                    array_map(function ($v) {
+                    array_map(function($v) {
                         $this->unlink($v);
                     }, $matches);
                 }

library/think/db/builder/Mysql.php

Spacing +6 added lines, -6 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;
     }
 
     /**
@@ -129,7 +129,7 @@ 
             // 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);
 
@@ -146,11 +146,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)) {
@@ -158,7 +158,7 @@ 
                 $table = str_replace('.', '`.`', $table);
             }
 
-            $key = '`' . $table . '`.' . $key;
+            $key = '`'.$table.'`.'.$key;
         }
 
         return $key;