top-think / framework

src/think/db/PDOConnection.php

Spacing +24 added lines, -25 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -136,7 +136,7 @@ 
      */
     public function getBuilderClass(): string
     {
-        return $this->getConfig('builder') ?: '\\think\\db\\builder\\' . ucfirst($this->getConfig('type'));
+        return $this->getConfig('builder') ?: '\\think\\db\\builder\\'.ucfirst($this->getConfig('type'));
     }
 
     /**
@@ -246,14 +246,14 @@ 
         list($tableName) = explode(' ', $tableName);
 
         if (!strpos($tableName, '.')) {
-            $schema = $this->getConfig('database') . '.' . $tableName;
+            $schema = $this->getConfig('database').'.'.$tableName;
         } else {
             $schema = $tableName;
         }
 
         if (!isset($this->info[$schema])) {
             // 读取缓存
-            $cacheFile = Container::pull('app')->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR . $schema . '.php';
+            $cacheFile = Container::pull('app')->getRuntimePath().'schema'.DIRECTORY_SEPARATOR.$schema.'.php';
 
             if (!$this->config['debug'] && is_file($cacheFile)) {
                 $info = include $cacheFile;
@@ -262,7 +262,7 @@ 
             }
 
             $fields = array_keys($info);
-            $bind   = $type   = [];
+            $bind   = $type = [];
 
             foreach ($info as $key => $val) {
                 // 记录字段类型
@@ -381,7 +381,7 @@ 
             $startTime             = microtime(true);
             $this->links[$linkNum] = $this->createPdo($config['dsn'], $config['username'], $config['password'], $params);
             // 记录数据库连接信息
-            $this->log('CONNECT:[ UseTime:' . number_format(microtime(true) - $startTime, 6) . 's ] ' . $config['dsn']);
+            $this->log('CONNECT:[ UseTime:'.number_format(microtime(true) - $startTime, 6).'s ] '.$config['dsn']);
 
             return $this->links[$linkNum];
         } catch (\PDOException $e) {
@@ -643,7 +643,7 @@ 
 
         if (!$result) {
             // 执行查询
-            $resultSet = $this->query($query, function ($query) {
+            $resultSet = $this->query($query, function($query) {
                 return $this->builder->select($query, true);
             });
 
@@ -688,7 +688,7 @@ 
 
         if (!$resultSet) {
             // 执行查询操作
-            $resultSet = $this->query($query, function ($query) {
+            $resultSet = $this->query($query, function($query) {
                 return $this->builder->select($query);
             });
         }
@@ -921,7 +921,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);
 
         $result = $this->value($query, $field, 0, false);
 
@@ -945,7 +945,7 @@ 
         }
 
         if ($key && '*' != $column) {
-            $field = $key . ',' . $column;
+            $field = $key.','.$column;
         } else {
             $field = $column;
         }
@@ -1016,15 +1016,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);
@@ -1043,7 +1042,7 @@ 
     {
         foreach ($bind as $key => $val) {
             // 占位符
-            $param = is_numeric($key) ? $key + 1 : ':' . $key;
+            $param = is_numeric($key) ? $key + 1 : ':'.$key;
 
             if (is_array($val)) {
                 if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
@@ -1079,7 +1078,7 @@ 
     protected function bindParam(array $bind): void
     {
         foreach ($bind as $key => $val) {
-            $param = is_numeric($key) ? $key + 1 : ':' . $key;
+            $param = is_numeric($key) ? $key + 1 : ':'.$key;
 
             if (is_array($val)) {
                 array_unshift($val, $param);
@@ -1187,7 +1186,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) {
@@ -1230,7 +1229,7 @@ 
             $this->linkID->rollBack();
         } elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
             $this->linkID->exec(
-                $this->parseSavepointRollBack('trans' . $this->transTimes)
+                $this->parseSavepointRollBack('trans'.$this->transTimes)
             );
         }
 
@@ -1254,7 +1253,7 @@ 
      */
     protected function parseSavepoint(string $name): string
     {
-        return 'SAVEPOINT ' . $name;
+        return 'SAVEPOINT '.$name;
     }
 
     /**
@@ -1265,7 +1264,7 @@ 
      */
     protected function parseSavepointRollBack(string $name): string
     {
-        return 'ROLLBACK TO SAVEPOINT ' . $name;
+        return 'ROLLBACK TO SAVEPOINT '.$name;
     }
 
     /**
@@ -1403,13 +1402,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;
@@ -1473,10 +1472,10 @@ 
             }
 
             // 未注册监听则记录到日志中
-            $this->log($sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]');
+            $this->log($sql.' [ '.$master.'RunTime:'.$runtime.'s ]');
 
             if (!empty($explain)) {
-                $this->log('[ EXPLAIN : ' . var_export($explain, true) . ' ]');
+                $this->log('[ EXPLAIN : '.var_export($explain, true).' ]');
             }
         }
     }
@@ -1578,9 +1577,9 @@ 
         } else {
             if (true === $key) {
                 if (!empty($query->getOptions('key'))) {
-                    $key = 'think:' . $this->getConfig('database') . '.' . $query->getTable() . '|' . $query->getOptions('key');
+                    $key = 'think:'.$this->getConfig('database').'.'.$query->getTable().'|'.$query->getOptions('key');
                 } else {
-                    $key = md5($this->getConfig('database') . serialize($query->getOptions()) . serialize($query->getBind(false)));
+                    $key = md5($this->getConfig('database').serialize($query->getOptions()).serialize($query->getBind(false)));
                 }
             }