top-think / framework

library/think/model/concern/SoftDelete.php

Spacing +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
             $query->where($data);
             $data = null;
         } elseif ($data instanceof \Closure) {
-            call_user_func_array($data, [ & $query]);
+            call_user_func_array($data, [& $query]);
             $data = null;
         } elseif (is_null($data)) {
             return false;
@@ -213,7 +213,7 @@ 
         }
 
         if (false === strpos($field, '.')) {
-            $field = '__TABLE__.' . $field;
+            $field = '__TABLE__.'.$field;
         }
 
         if (!$read && strpos($field, '.')) {

library/think/model/relation/MorphMany.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         }
 
         return $this->query
-            ->whereExp($this->morphKey, '=' . $this->parent->getTable() . '.' . $this->parent->getPk())
+            ->whereExp($this->morphKey, '='.$this->parent->getTable().'.'.$this->parent->getPk())
             ->where($this->morphType, '=', $this->type)
             ->fetchSql()
             ->$aggregate($field);

library/think/model/relation/BelongsToMany.php

Spacing +9 added lines, -9 removed lines

@@ -152,7 +152,7 @@ 
         // 关联查询
         $pk = $this->parent->getPk();
 
-        $condition[] = ['pivot.' . $localKey, '=', $this->parent->$pk];
+        $condition[] = ['pivot.'.$localKey, '=', $this->parent->$pk];
 
         return $this->belongsToManyQuery($foreignKey, $localKey, $condition);
     }
@@ -281,7 +281,7 @@ 
      */
     public function wherePivot($field, $op = null, $condition = null)
     {
-        $this->query->where('pivot.' . $field, $op, $condition);
+        $this->query->where('pivot.'.$field, $op, $condition);
         return $this;
     }
 
@@ -311,7 +311,7 @@ 
         if (!empty($range)) {
             // 查询关联数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $localKey, 'in', $range],
+                ['pivot.'.$localKey, 'in', $range],
             ], $relation, $subRelation, $closure);
 
             // 关联属性名
@@ -345,7 +345,7 @@ 
             $pk = $result->$pk;
             // 查询管理数据
             $data = $this->eagerlyManyToMany([
-                ['pivot.' . $this->localKey, '=', $pk],
+                ['pivot.'.$this->localKey, '=', $pk],
             ], $relation, $subRelation, $closure);
 
             // 关联数据封装
@@ -386,7 +386,7 @@ 
         }
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
-            ['pivot.' . $this->localKey, '=', $pk],
+            ['pivot.'.$this->localKey, '=', $pk],
         ])->$aggregate($field);
     }
 
@@ -411,7 +411,7 @@ 
 
         return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
             [
-                'pivot.' . $this->localKey, 'exp', $this->query->raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()),
+                'pivot.'.$this->localKey, 'exp', $this->query->raw('='.$this->parent->getTable().'.'.$this->parent->getPk()),
             ],
         ])->fetchSql()->$aggregate($field);
     }
@@ -479,7 +479,7 @@ 
 
         if (empty($this->baseQuery)) {
             $relationFk = $this->query->getPk();
-            $query->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+            $query->join([$table => 'pivot'], 'pivot.'.$foreignKey.'='.$tableName.'.'.$relationFk)
                 ->where($condition);
         }
 
@@ -701,8 +701,8 @@ 
             $table = $this->pivot->getTable();
 
             $this->query
-                ->join([$table => 'pivot'], 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())
-                ->where('pivot.' . $this->localKey, $this->parent->$pk);
+                ->join([$table => 'pivot'], 'pivot.'.$this->foreignKey.'='.$this->query->getTable().'.'.$this->query->getPk())
+                ->where('pivot.'.$this->localKey, $this->parent->$pk);
             $this->baseQuery = true;
         }
     }

library/think/model/relation/OneToOne.php

Spacing +4 added lines, -4 removed lines

@@ -82,9 +82,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) {
@@ -99,7 +99,7 @@ 
         }
 
         $query->join([$joinTable => $joinAlias], $joinOn, $joinType)
-            ->field($field, false, $joinTable, $joinAlias, $relation . '__');
+            ->field($field, false, $joinTable, $joinAlias, $relation.'__');
     }
 
     /**
@@ -291,7 +291,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/exception/ThrowableError.php

Spacing +3 added lines, -3 removed lines

@@ -17,13 +17,13 @@
     {
 
         if ($e instanceof \ParseError) {
-            $message  = 'Parse error: ' . $e->getMessage();
+            $message  = 'Parse error: '.$e->getMessage();
             $severity = E_PARSE;
         } elseif ($e instanceof \TypeError) {
-            $message  = 'Type error: ' . $e->getMessage();
+            $message  = 'Type error: '.$e->getMessage();
             $severity = E_RECOVERABLE_ERROR;
         } else {
-            $message  = 'Fatal error: ' . $e->getMessage();
+            $message  = 'Fatal error: '.$e->getMessage();
             $severity = E_ERROR;
         }
 

library/think/exception/Handle.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
             }
 
             if (Container::get('app')->config('log.record_trace')) {
-                $log .= "\r\n" . $exception->getTraceAsString();
+                $log .= "\r\n".$exception->getTraceAsString();
             }
 
             Container::get('log')->record($log, 'error');
@@ -237,10 +237,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

library/think/db/Query.php

Spacing +41 added lines, -41 removed lines

@@ -169,15 +169,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);
         }
     }
 
@@ -296,7 +296,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . Loader::parseName($name);
+        return $this->prefix.Loader::parseName($name);
     }
 
     /**
@@ -568,16 +568,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];
     }
 
     /**
@@ -643,7 +643,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();
 
@@ -746,7 +746,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) {
@@ -779,7 +779,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) {
@@ -810,15 +810,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 {
             // 更新缓存
@@ -1017,10 +1017,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;
                 }
             }
         }
@@ -1147,7 +1147,7 @@ 
             $table  = $this->getJoinTable($join, $alias);
 
             if (true === $field) {
-                $fields = $alias . '.*';
+                $fields = $alias.'.*';
             } else {
                 if (is_string($field)) {
                     $field = explode(',', $field);
@@ -1155,17 +1155,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;
                     }
@@ -1478,9 +1478,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);
             }
         }
     }
@@ -1524,7 +1524,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) {
@@ -1708,7 +1708,7 @@ 
             list($offset, $length) = explode(',', $offset);
         }
 
-        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+        $this->options['limit'] = intval($offset).($length ? ','.intval($length) : '');
 
         return $this;
     }
@@ -1765,7 +1765,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',
@@ -1875,7 +1875,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
 
             if (strpos($field, ',')) {
@@ -1886,9 +1886,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]);
                 }
             }
@@ -2300,7 +2300,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);
@@ -2327,7 +2327,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);
@@ -2392,7 +2392,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);
     }
 
     /**
@@ -2470,7 +2470,7 @@ 
         if (is_array($value)) {
             $this->bind = array_merge($this->bind, $value);
         } else {
-            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
+            $name = $name ?: 'ThinkBind_'.(count($this->bind) + 1).'_';
 
             $this->bind[$name] = [$value, $type];
             return $name;
@@ -2687,10 +2687,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]);
             }
         }
 
@@ -3409,10 +3409,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);
     }
 
     /**
@@ -3548,7 +3548,7 @@ 
      */
     public function buildSql($sub = true)
     {
-        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+        return $sub ? '( '.$this->select(false).' )' : $this->select(false);
     }
 
     /**
@@ -3619,7 +3619,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];
@@ -3630,7 +3630,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');
@@ -3706,7 +3706,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows > 0 ? $listRows : (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;

library/think/db/builder/Sqlsrv.php

Spacing +11 added lines, -11 removed lines

@@ -48,22 +48,22 @@ 
                 $array[] = $this->parseRand($query);
             } else {
                 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);
     }
 
     /**
@@ -111,15 +111,15 @@ 
         }
 
         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)) {
-            $key = '[' . $table . '].' . $key;
+            $key = '['.$table.'].'.$key;
         }
 
         return $key;
@@ -141,12 +141,12 @@ 
         $limit = explode(',', $limit);
 
         if (count($limit) > 1) {
-            $limitStr = '(T1.ROW_NUMBER BETWEEN ' . $limit[0] . ' + 1 AND ' . $limit[0] . ' + ' . $limit[1] . ')';
+            $limitStr = '(T1.ROW_NUMBER BETWEEN '.$limit[0].' + 1 AND '.$limit[0].' + '.$limit[1].')';
         } else {
-            $limitStr = '(T1.ROW_NUMBER BETWEEN 1 AND ' . $limit[0] . ")";
+            $limitStr = '(T1.ROW_NUMBER BETWEEN 1 AND '.$limit[0].")";
         }
 
-        return 'WHERE ' . $limitStr;
+        return 'WHERE '.$limitStr;
     }
 
     public function selectInsert(Query $query, $fields, $table)

library/think/db/builder/Sqlite.php

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,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].' ';
             }
         }
 
@@ -88,7 +88,7 @@ 
         }
 
         if (isset($table)) {
-            $key = $table . '.' . $key;
+            $key = $table.'.'.$key;
         }
 
         return $key;