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('[ 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];
         } 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;
     }
 
     /**
@@ -1376,13 +1375,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;
@@ -1446,10 +1445,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).' ]');
             }
         }
     }
@@ -1551,9 +1550,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)));
                 }
             }
 

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'];

src/think/Validate.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -365,7 +365,7 @@ 
      */
     public function hasScene(string $name): bool
     {
-        return isset($this->scene[$name]) || method_exists($this, 'scene' . $name);
+        return isset($this->scene[$name]) || method_exists($this, 'scene'.$name);
     }
 
     /**
@@ -717,7 +717,7 @@ 
             if (strpos($field, '_confirm')) {
                 $rule = strstr($field, '_confirm', true);
             } else {
-                $rule = $field . '_confirm';
+                $rule = $field.'_confirm';
             }
         }
 
@@ -868,9 +868,9 @@ 
                 if (isset($this->type[$rule])) {
                     // 注册的验证规则
                     $result = call_user_func_array($this->type[$rule], [$value]);
-                } elseif (function_exists('ctype_' . $rule)) {
+                } elseif (function_exists('ctype_'.$rule)) {
                     // ctype验证规则
-                    $ctypeFun = 'ctype_' . $rule;
+                    $ctypeFun = 'ctype_'.$rule;
                     $result   = $ctypeFun($value);
                 } elseif (isset($this->filter[$rule])) {
                     // Filter_var验证规则
@@ -1508,7 +1508,7 @@ 
 
         if (is_string($rule) && 0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
             // 不是正则表达式则两端补上/
-            $rule = '/^' . $rule . '$/';
+            $rule = '/^'.$rule.'$/';
         }
 
         return is_scalar($value) && 1 === preg_match($rule, (string) $value);
@@ -1558,8 +1558,8 @@ 
      */
     protected function getRuleMsg(string $attribute, string $title, string $type, $rule): string
     {
-        if (isset($this->message[$attribute . '.' . $type])) {
-            $msg = $this->message[$attribute . '.' . $type];
+        if (isset($this->message[$attribute.'.'.$type])) {
+            $msg = $this->message[$attribute.'.'.$type];
         } elseif (isset($this->message[$attribute][$type])) {
             $msg = $this->message[$attribute][$type];
         } elseif (isset($this->message[$attribute])) {
@@ -1569,7 +1569,7 @@ 
         } elseif (0 === strpos($type, 'require')) {
             $msg = $this->typeMsg['require'];
         } else {
-            $msg = $title . $this->lang->get('not conform to the rules');
+            $msg = $title.$this->lang->get('not conform to the rules');
         }
 
         if (!is_string($msg)) {
@@ -1613,8 +1613,8 @@ 
     {
         $this->only = $this->append = $this->remove = [];
 
-        if (method_exists($this, 'scene' . $scene)) {
-            call_user_func([$this, 'scene' . $scene]);
+        if (method_exists($this, 'scene'.$scene)) {
+            call_user_func([$this, 'scene'.$scene]);
         } elseif (isset($this->scene[$scene])) {
             // 如果设置了验证适用场景
             $this->only = $this->scene[$scene];

src/think/debug/Console.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yangweijie <yangweijiester@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace think\debug;
 
 use think\App;
@@ -52,21 +52,21 @@ 
         $mem     = number_format((memory_get_usage() - $app->getBeginMem()) / 1024, 2);
 
         if ($request->host()) {
-            $uri = $request->protocol() . ' ' . $request->method() . ' : ' . $request->url(true);
+            $uri = $request->protocol().' '.$request->method().' : '.$request->url(true);
         } else {
-            $uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+            $uri = 'cmd:'.implode(' ', $_SERVER['argv']);
         }
 
         // 页面Trace信息
         $base = [
-            '请求信息' => date('Y-m-d H:i:s', $request->time()) . ' ' . $uri,
-            '运行时间' => number_format((float) $runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
-            '查询信息' => $app->db->getQueryTimes() . ' queries',
-            '缓存信息' => $app->cache->getReadTimes() . ' reads,' . $app->cache->getWriteTimes() . ' writes',
+            '请求信息' => date('Y-m-d H:i:s', $request->time()).' '.$uri,
+            '运行时间' => number_format((float) $runtime, 6).'s [ 吞吐率：'.$reqs.'req/s ] 内存消耗：'.$mem.'kb 文件加载：'.count(get_included_files()),
+            '查询信息' => $app->db->getQueryTimes().' queries',
+            '缓存信息' => $app->cache->getReadTimes().' reads,'.$app->cache->getWriteTimes().' writes',
         ];
 
         if ($app->session->getId(false)) {
-            $base['会话信息'] = 'SESSION_ID=' . $app->session->getId();
+            $base['会话信息'] = 'SESSION_ID='.$app->session->getId();
         }
 
         $info = $this->getFileInfo();
@@ -125,9 +125,9 @@ 
                 case '调试':
                     $var_type = gettype($m);
                     if (in_array($var_type, ['array', 'string'])) {
-                        $line[] = "console.log(" . json_encode($m) . ");";
+                        $line[] = "console.log(".json_encode($m).");";
                     } else {
-                        $line[] = "console.log(" . json_encode(var_export($m, true)) . ");";
+                        $line[] = "console.log(".json_encode(var_export($m, true)).");";
                     }
                     break;
                 case '错误':
@@ -141,7 +141,7 @@ 
                     $line[] = "console.log(\"%c{$msg}\", \"{$style}\");";
                     break;
                 default:
-                    $m      = is_string($key) ? $key . ' ' . $m : $key + 1 . ' ' . $m;
+                    $m      = is_string($key) ? $key.' '.$m : $key + 1.' '.$m;
                     $msg    = json_encode($m);
                     $line[] = "console.log({$msg});";
                     break;
@@ -162,7 +162,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;

src/think/debug/Html.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace think\debug;
 
 use think\App;
@@ -57,20 +57,20 @@ 
 
         // 页面Trace信息
         if ($request->host()) {
-            $uri = $request->protocol() . ' ' . $request->method() . ' : ' . $request->url(true);
+            $uri = $request->protocol().' '.$request->method().' : '.$request->url(true);
         } else {
-            $uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+            $uri = 'cmd:'.implode(' ', $_SERVER['argv']);
         }
 
         $base = [
-            '请求信息' => date('Y-m-d H:i:s', $request->time()) . ' ' . $uri,
-            '运行时间' => number_format((float) $runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
-            '查询信息' => $app->db->getQueryTimes() . ' queries',
-            '缓存信息' => $app->cache->getReadTimes() . ' reads,' . $app->cache->getWriteTimes() . ' writes',
+            '请求信息' => date('Y-m-d H:i:s', $request->time()).' '.$uri,
+            '运行时间' => number_format((float) $runtime, 6).'s [ 吞吐率：'.$reqs.'req/s ] 内存消耗：'.$mem.'kb 文件加载：'.count(get_included_files()),
+            '查询信息' => $app->db->getQueryTimes().' queries',
+            '缓存信息' => $app->cache->getReadTimes().' reads,'.$app->cache->getWriteTimes().' writes',
         ];
 
         if ($app->session->getId(false)) {
-            $base['会话信息'] = 'SESSION_ID=' . $app->session->getId();
+            $base['会话信息'] = 'SESSION_ID='.$app->session->getId();
         }
 
         $info = $this->getFileInfo();
@@ -102,7 +102,7 @@ 
         }
         // 调用Trace页面模板
         ob_start();
-        include $this->config['file'] ?: __DIR__ . '/../../tpl/page_trace.tpl';
+        include $this->config['file'] ?: __DIR__.'/../../tpl/page_trace.tpl';
         return ob_get_clean();
     }
 
@@ -117,7 +117,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;

src/think/middleware/CheckRequestCache.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 
@@ -87,9 +87,9 @@ 
 
         if (isset($key) && 200 == $response->getCode() && $response->isAllowCache()) {
             $header                  = $response->getHeader();
-            $header['Cache-Control'] = 'max-age=' . $expire . ',must-revalidate';
-            $header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
-            $header['Expires']       = gmdate('D, d M Y H:i:s', time() + $expire) . ' GMT';
+            $header['Cache-Control'] = 'max-age='.$expire.',must-revalidate';
+            $header['Last-Modified'] = gmdate('D, d M Y H:i:s').' GMT';
+            $header['Expires']       = gmdate('D, d M Y H:i:s', time() + $expire).' GMT';
 
             $this->cache->tag($tag)->set($key, [$response->getContent(), $header], $expire);
         }
@@ -138,12 +138,12 @@ 
         if (false !== strpos($key, ':')) {
             $param = $request->param();
             foreach ($param as $item => $val) {
-                if (is_string($val) && false !== strpos($key, ':' . $item)) {
-                    $key = str_replace(':' . $item, $val, $key);
+                if (is_string($val) && false !== strpos($key, ':'.$item)) {
+                    $key = str_replace(':'.$item, $val, $key);
                 }
             }
         } elseif (strpos($key, ']')) {
-            if ('[' . $request->ext() . ']' == $key) {
+            if ('['.$request->ext().']' == $key) {
                 // 缓存某个后缀的请求
                 $key = md5($request->url());
             } else {

src/think/middleware/SessionInit.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 

src/think/middleware/TraceDebug.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 
@@ -78,9 +78,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;
                 }
             }
         }

src/think/middleware/LoadLangPack.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 
@@ -40,7 +40,7 @@ 
         if ($lang->defaultLangSet() != $langset) {
             // 加载系统语言包
             $lang->load([
-                $app->getThinkPath() . 'lang' . DIRECTORY_SEPARATOR . $langset . '.php',
+                $app->getThinkPath().'lang'.DIRECTORY_SEPARATOR.$langset.'.php',
             ]);
 
             $app->LoadLangPack($langset);

src/think/file/UploadedFile.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
             $target = $this->getTargetFile($directory, $name);
 
-            set_error_handler(function ($type, $msg) use (&$error) {
+            set_error_handler(function($type, $msg) use (&$error) {
                 $error = $msg;
             });