top-think / framework

convention.php

Spacing +4 added lines, -4 removed lines

@@ -136,10 +136,10 @@ 
         // +----------------------------------------------------------------------
 
         // 默认跳转页面对应的模板文件
-        'dispatch_success_tmpl'  => __DIR__ . '/tpl/dispatch_jump.tpl',
-        'dispatch_error_tmpl'    => __DIR__ . '/tpl/dispatch_jump.tpl',
+        'dispatch_success_tmpl'  => __DIR__.'/tpl/dispatch_jump.tpl',
+        'dispatch_error_tmpl'    => __DIR__.'/tpl/dispatch_jump.tpl',
         // 异常页面的模板文件
-        'exception_tmpl'         => __DIR__ . '/tpl/think_exception.tpl',
+        'exception_tmpl'         => __DIR__.'/tpl/think_exception.tpl',
         // 错误显示信息,非调试模式有效
         'error_message'          => '页面错误！请稍后再试～',
         // 显示错误信息
@@ -199,7 +199,7 @@ 
     'trace'      => [
         // 内置Html Console 支持扩展
         'type' => 'Html',
-        'file' => __DIR__ . '/tpl/page_trace.tpl',
+        'file' => __DIR__.'/tpl/page_trace.tpl',
     ],
 
     // +----------------------------------------------------------------------

base.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 namespace think;
 
 // 载入Loader类
-require __DIR__ . '/library/think/Loader.php';
+require __DIR__.'/library/think/Loader.php';
 
 // 注册自动加载
 Loader::register();

library/think/Env.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
     protected function getEnv($name, $default = null, $php_prefix = true)
     {
         if ($php_prefix) {
-            $name = 'PHP_' . $name;
+            $name = 'PHP_'.$name;
         }
 
         $result = getenv($name);
@@ -98,7 +98,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;

library/think/debug/Console.php

Spacing +10 added lines, -10 removed lines

@@ -55,21 +55,21 @@ 
         $mem     = number_format((memory_get_usage() - Container::get('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', $_SERVER['REQUEST_TIME']) . ' ' . $uri,
-            '运行时间' => number_format($runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
-            '查询信息' => Db::$queryTimes . ' queries ' . Db::$executeTimes . ' writes ',
-            '缓存信息' => Container::get('cache')->getReadTimes() . ' reads,' . Container::get('cache')->getWriteTimes() . ' writes',
+            '请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']).' '.$uri,
+            '运行时间' => number_format($runtime, 6).'s [ 吞吐率：'.$reqs.'req/s ] 内存消耗：'.$mem.'kb 文件加载：'.count(get_included_files()),
+            '查询信息' => Db::$queryTimes.' queries '.Db::$executeTimes.' writes ',
+            '缓存信息' => Container::get('cache')->getReadTimes().' reads,'.Container::get('cache')->getWriteTimes().' writes',
         ];
 
         if (session_id()) {
-            $base['会话信息'] = 'SESSION_ID=' . session_id();
+            $base['会话信息'] = 'SESSION_ID='.session_id();
         }
 
         $info = Container::get('debug')->getFile(true);
@@ -127,9 +127,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, 1)) . ");";
+                        $line[] = "console.log(".json_encode(var_export($m, 1)).");";
                     }
                     break;
                 case '错误':
@@ -143,7 +143,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;

library/think/debug/Html.php

Spacing +7 added lines, -7 removed lines

@@ -55,19 +55,19 @@
 
         // 页面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', $_SERVER['REQUEST_TIME']) . ' ' . $uri,
-            '运行时间' => number_format($runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
-            '查询信息' => Db::$queryTimes . ' queries ' . Db::$executeTimes . ' writes ',
-            '缓存信息' => Container::get('cache')->getReadTimes() . ' reads,' . Container::get('cache')->getWriteTimes() . ' writes',
+            '请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']).' '.$uri,
+            '运行时间' => number_format($runtime, 6).'s [ 吞吐率：'.$reqs.'req/s ] 内存消耗：'.$mem.'kb 文件加载：'.count(get_included_files()),
+            '查询信息' => Db::$queryTimes.' queries '.Db::$executeTimes.' writes ',
+            '缓存信息' => Container::get('cache')->getReadTimes().' reads,'.Container::get('cache')->getWriteTimes().' writes',
         ];
 
         if (session_id()) {
-            $base['会话信息'] = 'SESSION_ID=' . session_id();
+            $base['会话信息'] = 'SESSION_ID='.session_id();
         }
 
         $info = Container::get('debug')->getFile(true);

library/think/log/driver/Socket.php

Spacing +9 added lines, -9 removed lines

@@ -76,21 +76,21 @@ 
         if ($this->app->isDebug()) {
             $runtime    = round(microtime(true) - $this->app->getBeginTime(), 10);
             $reqs       = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
-            $time_str   = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
+            $time_str   = ' [运行时间：'.number_format($runtime, 6).'s][吞吐率：'.$reqs.'req/s]';
             $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
-            $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
-            $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+            $memory_str = ' [内存消耗：'.$memory_use.'kb]';
+            $file_load  = ' [文件加载：'.count(get_included_files()).']';
 
             if (isset($_SERVER['HTTP_HOST'])) {
-                $current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                $current_uri = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
             } else {
-                $current_uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+                $current_uri = 'cmd:'.implode(' ', $_SERVER['argv']);
             }
 
             // 基本信息
             $trace[] = [
                 'type' => 'group',
-                'msg'  => $current_uri . $time_str . $memory_str . $file_load,
+                'msg'  => $current_uri.$time_str.$memory_str.$file_load,
                 'css'  => $this->css['page'],
             ];
         }
@@ -98,7 +98,7 @@ 
         foreach ($log as $type => $val) {
             $trace[] = [
                 'type' => in_array($type, $this->config['expand_level']) ? 'group' : 'groupCollapsed',
-                'msg'  => '[ ' . $type . ' ]',
+                'msg'  => '[ '.$type.' ]',
                 'css'  => isset($this->css[$type]) ? $this->css[$type] : '',
             ];
 
@@ -184,7 +184,7 @@ 
         ];
 
         $msg     = @json_encode($logs);
-        $address = '/' . $client_id; //将client_id作为地址， server端通过地址判断将日志发布给谁
+        $address = '/'.$client_id; //将client_id作为地址， server端通过地址判断将日志发布给谁
 
         $this->send($this->config['host'], $msg, $address);
     }
@@ -257,7 +257,7 @@ 
      */
     protected function send($host, $message = '', $address = '/')
     {
-        $url = 'http://' . $host . ':' . $this->port . $address;
+        $url = 'http://'.$host.':'.$this->port.$address;
         $ch  = curl_init();
 
         curl_setopt($ch, CURLOPT_URL, $url);

library/think/route/RuleGroup.php

Spacing +11 added lines, -11 removed lines

@@ -92,7 +92,7 @@ 
         }
 
         if ($this->parent && $this->parent->getFullName()) {
-            $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
+            $this->fullName = $this->parent->getFullName().($this->name ? '/'.$this->name : '');
         } else {
             $this->fullName = $this->name;
         }
@@ -182,7 +182,7 @@ 
 
         if ($this->auto) {
             // 自动解析URL地址
-            $result = new UrlDispatch($request, $this, $this->auto . '/' . $url, ['auto_search' => false]);
+            $result = new UrlDispatch($request, $this, $this->auto.'/'.$url, ['auto_search' => false]);
         } elseif ($this->miss && in_array($this->miss->getMethod(), ['*', $method])) {
             // 未匹配所有路由的路由规则处理
             $result = $this->miss->parseRule($request, '', $this->miss->getRoute(), $url, $this->miss->mergeGroupOptions());
@@ -279,11 +279,11 @@ 
     protected function checkMergeRuleRegex($request, &$rules, $url, $completeMatch)
     {
         $depr = $this->router->config('pathinfo_depr');
-        $url  = $depr . str_replace('|', $depr, $url);
+        $url  = $depr.str_replace('|', $depr, $url);
 
         foreach ($rules as $key => $item) {
             if ($item instanceof RuleItem) {
-                $rule = $depr . str_replace('/', $depr, $item->getRule());
+                $rule = $depr.str_replace('/', $depr, $item->getRule());
                 if ($depr == $rule && $depr != $url) {
                     unset($rules[$key]);
                     continue;
@@ -300,21 +300,21 @@ 
                     continue;
                 }
 
-                $slash = preg_quote('/-' . $depr, '/');
+                $slash = preg_quote('/-'.$depr, '/');
 
-                if ($matchRule = preg_split('/[' . $slash . ']<\w+\??>/', $rule, 2)) {
+                if ($matchRule = preg_split('/['.$slash.']<\w+\??>/', $rule, 2)) {
                     if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                         unset($rules[$key]);
                         continue;
                     }
                 }
 
-                if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+                if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
                     unset($rules[$key]);
                     $pattern = array_merge($this->getPattern(), $item->getPattern());
                     $option  = array_merge($this->getOption(), $item->getOption());
 
-                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key);
+                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_'.$key);
                     $items[$key] = $item;
                 }
             }
@@ -325,7 +325,7 @@ 
         }
 
         try {
-            $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
+            $result = preg_match('/^(?:'.implode('|', $regex).')/u', $url, $match);
         } catch (\Exception $e) {
             throw new Exception('route pattern error');
         }
@@ -342,7 +342,7 @@ 
 
             if (!isset($pos)) {
                 foreach ($regex as $key => $item) {
-                    if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) {
+                    if (0 === strpos(str_replace(['\/', '\-', '\\'.$depr], ['/', '-', $depr], $item), $match[0])) {
                         $pos = $key;
                         break;
                     }
@@ -505,7 +505,7 @@ 
     public function prefix($prefix)
     {
         if ($this->parent && $this->parent->getOption('prefix')) {
-            $prefix = $this->parent->getOption('prefix') . $prefix;
+            $prefix = $this->parent->getOption('prefix').$prefix;
         }
 
         return $this->option('prefix', $prefix);

library/think/route/Resource.php

Spacing +5 added lines, -5 removed lines

@@ -79,10 +79,10 @@ 
             $item  = [];
 
             foreach ($array as $val) {
-                $item[] = $val . '/<' . (isset($option['var'][$val]) ? $option['var'][$val] : $val . '_id') . '>';
+                $item[] = $val.'/<'.(isset($option['var'][$val]) ? $option['var'][$val] : $val.'_id').'>';
             }
 
-            $rule = implode('/', $item) . '/' . $last;
+            $rule = implode('/', $item).'/'.$last;
         }
 
         $prefix = substr($rule, strlen($this->name) + 1);
@@ -95,12 +95,12 @@ 
             }
 
             if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$last].'>', $val[1]);
             } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$rule].'>', $val[1]);
             }
 
-            $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+            $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]);
         }
 
         $this->router->setGroup($origin);

library/think/route/RuleItem.php

Spacing +10 added lines, -10 removed lines

@@ -66,7 +66,7 @@ 
         $rule = '/' != $rule ? ltrim($rule, '/') : '';
 
         if ($this->parent && $prefix = $this->parent->getFullName()) {
-            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+            $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : '');
         }
 
         if (false !== strpos($rule, ':')) {
@@ -216,7 +216,7 @@ 
 
         if (isset($option['ext'])) {
             // 路由ext参数 优先于系统配置的URL伪静态后缀参数
-            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+            $url = preg_replace('/\.('.$request->ext().')$/i', '', $url);
         }
 
         return $url;
@@ -240,38 +240,38 @@ 
         $depr    = $this->router->config('pathinfo_depr');
 
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].'/', str_replace('|', $depr, $url))) {
             return false;
         }
 
         $var  = [];
-        $url  = $depr . str_replace('|', $depr, $url);
-        $rule = $depr . str_replace('/', $depr, $this->rule);
+        $url  = $depr.str_replace('|', $depr, $url);
+        $rule = $depr.str_replace('/', $depr, $this->rule);
 
         if ($depr == $rule && $depr != $url) {
             return false;
         }
 
         if (false === strpos($rule, '<')) {
-            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) {
                 return $var;
             }
             return false;
         }
 
-        $slash = preg_quote('/-' . $depr, '/');
+        $slash = preg_quote('/-'.$depr, '/');
 
-        if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) {
+        if ($matchRule = preg_split('/['.$slash.']?<\w+\??>/', $rule, 2)) {
             if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                 return false;
             }
         }
 
-        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+        if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
             $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
 
             try {
-                if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/u', $url, $match)) {
+                if (!preg_match('/^'.$regex.($completeMatch ? '$' : '').'/u', $url, $match)) {
                     return false;
                 }
             } catch (\Exception $e) {