top-think / framework

src/think/route/dispatch/Callback.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\route\dispatch;
 

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