top-think / framework

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>';
     }
 
     /**

library/think/session/driver/Memcached.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,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,7 +108,7 @@ 
      */
     public function write($sessID, $sessData)
     {
-        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, $this->config['expire']);
+        return $this->handler->set($this->config['session_name'].$sessID, $sessData, $this->config['expire']);
     }
 
     /**
@@ -119,7 +119,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID);
+        return $this->handler->delete($this->config['session_name'].$sessID);
     }
 
     /**

library/think/session/driver/Memcache.php

Spacing +4 added lines, -5 removed lines

@@ -58,8 +58,7 @@ 
         foreach ((array) $hosts as $i => $host) {
             $port = isset($ports[$i]) ? $ports[$i] : $ports[0];
             $this->config['timeout'] > 0 ?
-            $this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']) :
-            $this->handler->addServer($host, $port, $this->config['persistent'], 1);
+            $this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']) : $this->handler->addServer($host, $port, $this->config['persistent'], 1);
         }
 
         return true;
@@ -85,7 +84,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);
     }
 
     /**
@@ -97,7 +96,7 @@ 
      */
     public function write($sessID, $sessData)
     {
-        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, 0, $this->config['expire']);
+        return $this->handler->set($this->config['session_name'].$sessID, $sessData, 0, $this->config['expire']);
     }
 
     /**
@@ -108,7 +107,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID);
+        return $this->handler->delete($this->config['session_name'].$sessID);
     }
 
     /**