top-think / framework

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/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/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;

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/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)) {