top-think / framework

src/think/Lang.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;
 

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/Env.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;
 
@@ -66,7 +66,7 @@ 
 
     protected function getEnv(string $name, $default = null)
     {
-        $result = getenv('PHP_' . $name);
+        $result = getenv('PHP_'.$name);
 
         if (false === $result) {
             return $default;
@@ -100,7 +100,7 @@ 
             foreach ($env as $key => $val) {
                 if (is_array($val)) {
                     foreach ($val as $k => $v) {
-                        $this->data[$key . '_' . strtoupper($k)] = $v;
+                        $this->data[$key.'_'.strtoupper($k)] = $v;
                     }
                 } else {
                     $this->data[$key] = $val;

src/think/contract/LogHandlerInterface.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\contract;
 

src/think/Request.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -384,7 +384,7 @@ 
      */
     public function domain(bool $port = false): string
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -399,7 +399,7 @@ 
         if (!$root) {
             $item  = explode('.', $this->host());
             $count = count($item);
-            $root  = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
+            $root  = $count > 1 ? $item[$count - 2].'.'.$item[$count - 1] : $item[0];
         }
 
         return $root;
@@ -487,14 +487,14 @@ 
         } elseif ($this->server('REQUEST_URI')) {
             $url = $this->server('REQUEST_URI');
         } elseif ($this->server('ORIG_PATH_INFO')) {
-            $url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+            $url = $this->server('ORIG_PATH_INFO').(!empty($this->server('QUERY_STRING')) ? '?'.$this->server('QUERY_STRING') : '');
         } elseif (isset($_SERVER['argv'][1])) {
             $url = $_SERVER['argv'][1];
         } else {
             $url = '';
         }
 
-        return $complete ? $this->domain() . $url : $url;
+        return $complete ? $this->domain().$url : $url;
     }
 
     /**
@@ -522,7 +522,7 @@ 
             $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
 
-        return $complete ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return $complete ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -543,8 +543,8 @@ 
                     $url = $this->server('PHP_SELF');
                 } elseif (basename($this->server('ORIG_SCRIPT_NAME')) === $script_name) {
                     $url = $this->server('ORIG_SCRIPT_NAME');
-                } elseif (($pos = strpos($this->server('PHP_SELF'), '/' . $script_name)) !== false) {
-                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos) . '/' . $script_name;
+                } elseif (($pos = strpos($this->server('PHP_SELF'), '/'.$script_name)) !== false) {
+                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos).'/'.$script_name;
                 } elseif ($this->server('DOCUMENT_ROOT') && strpos($this->server('SCRIPT_FILENAME'), $this->server('DOCUMENT_ROOT')) === 0) {
                     $url = str_replace('\\', '/', str_replace($this->server('DOCUMENT_ROOT'), '', $this->server('SCRIPT_FILENAME')));
                 }
@@ -552,7 +552,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $complete ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $complete ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -583,7 +583,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $complete ? $this->domain() . $this->root : $this->root;
+        return $complete ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -597,7 +597,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -1334,7 +1334,7 @@ 
                 if (is_scalar($data)) {
                     $data = (string) $data;
                 } else {
-                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                    throw new \InvalidArgumentException('variable type error：'.gettype($data));
                 }
                 break;
         }

src/think/Response.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -101,7 +101,7 @@ 
      */
     public static function create($data = '', string $type = '', int $code = 200): Response
     {
-        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
+        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\'.ucfirst(strtolower($type));
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, [$data, $code]);
@@ -150,7 +150,7 @@ 
             http_response_code($this->code);
             // 发送头部信息
             foreach ($this->header as $name => $val) {
-                header($name . (!is_null($val) ? ':' . $val : ''));
+                header($name.(!is_null($val) ? ':'.$val : ''));
             }
         }
 
@@ -343,7 +343,7 @@ 
      */
     public function contentType(string $contentType, string $charset = 'utf-8')
     {
-        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+        $this->header['Content-Type'] = $contentType.'; charset='.$charset;
 
         return $this;
     }