top-think / framework

library/think/console/Command.php

Spacing +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
         ];
         $replacements = [
             $name,
-            $_SERVER['PHP_SELF'] . ' ' . $name,
+            $_SERVER['PHP_SELF'].' '.$name,
         ];
 
         return str_replace($placeholders, $replacements, $this->getHelp());

library/think/template/taglib/Cx.php

Spacing +63 added lines, -63 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function tagPhp($tag, $content)
     {
-        $parseStr = '<?php ' . $content . ' ?>';
+        $parseStr = '<?php '.$content.' ?>';
         return $parseStr;
     }
 
@@ -93,28 +93,28 @@ 
 
         if (':' == $flag) {
             $name = $this->autoBuildVar($name);
-            $parseStr .= '$_result=' . $name . ';';
+            $parseStr .= '$_result='.$name.';';
             $name = '$_result';
         } else {
             $name = $this->autoBuildVar($name);
         }
 
-        $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): $' . $key . ' = 0;';
+        $parseStr .= 'if(is_array('.$name.') || '.$name.' instanceof \think\Collection || '.$name.' instanceof \think\Paginator): $'.$key.' = 0;';
 
         // 设置了输出数组长度
         if (0 != $offset || 'null' != $length) {
-            $parseStr .= '$__LIST__ = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); ';
+            $parseStr .= '$__LIST__ = is_array('.$name.') ? array_slice('.$name.','.$offset.','.$length.', true) : '.$name.'->slice('.$offset.','.$length.', true); ';
         } else {
-            $parseStr .= ' $__LIST__ = ' . $name . ';';
+            $parseStr .= ' $__LIST__ = '.$name.';';
         }
 
-        $parseStr .= 'if( count($__LIST__)==0 ) : echo "' . $empty . '" ;';
+        $parseStr .= 'if( count($__LIST__)==0 ) : echo "'.$empty.'" ;';
         $parseStr .= 'else: ';
-        $parseStr .= 'foreach($__LIST__ as $key=>$' . $id . '): ';
-        $parseStr .= '$mod = ($' . $key . ' % ' . $mod . ' );';
-        $parseStr .= '++$' . $key . ';?>';
+        $parseStr .= 'foreach($__LIST__ as $key=>$'.$id.'): ';
+        $parseStr .= '$mod = ($'.$key.' % '.$mod.' );';
+        $parseStr .= '++$'.$key.';?>';
         $parseStr .= $content;
-        $parseStr .= '<?php endforeach; endif; else: echo "' . $empty . '" ;endif; ?>';
+        $parseStr .= '<?php endforeach; endif; else: echo "'.$empty.'" ;endif; ?>';
 
         if (!empty($parseStr)) {
             return $parseStr;
@@ -140,7 +140,7 @@ 
         if (!empty($tag['expression'])) {
             $expression = ltrim(rtrim($tag['expression'], ')'), '(');
             $expression = $this->autoBuildVar($expression);
-            $parseStr   = '<?php foreach(' . $expression . '): ?>';
+            $parseStr   = '<?php foreach('.$expression.'): ?>';
             $parseStr .= $content;
             $parseStr .= '<?php endforeach; ?>';
             return $parseStr;
@@ -157,51 +157,51 @@ 
 
         // 支持用函数传数组
         if (':' == substr($name, 0, 1)) {
-            $var  = '$_' . uniqid();
+            $var  = '$_'.uniqid();
             $name = $this->autoBuildVar($name);
-            $parseStr .= $var . '=' . $name . '; ';
+            $parseStr .= $var.'='.$name.'; ';
             $name = $var;
         } else {
             $name = $this->autoBuildVar($name);
         }
 
-        $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): ';
+        $parseStr .= 'if(is_array('.$name.') || '.$name.' instanceof \think\Collection || '.$name.' instanceof \think\Paginator): ';
 
         // 设置了输出数组长度
         if (0 != $offset || 'null' != $length) {
             if (!isset($var)) {
-                $var = '$_' . uniqid();
+                $var = '$_'.uniqid();
             }
-            $parseStr .= $var . ' = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); ';
+            $parseStr .= $var.' = is_array('.$name.') ? array_slice('.$name.','.$offset.','.$length.', true) : '.$name.'->slice('.$offset.','.$length.', true); ';
         } else {
             $var = &$name;
         }
 
-        $parseStr .= 'if( count(' . $var . ')==0 ) : echo "' . $empty . '" ;';
+        $parseStr .= 'if( count('.$var.')==0 ) : echo "'.$empty.'" ;';
         $parseStr .= 'else: ';
 
         // 设置了索引项
         if (isset($tag['index'])) {
             $index = $tag['index'];
-            $parseStr .= '$' . $index . '=0; ';
+            $parseStr .= '$'.$index.'=0; ';
         }
 
-        $parseStr .= 'foreach(' . $var . ' as $' . $key . '=>$' . $item . '): ';
+        $parseStr .= 'foreach('.$var.' as $'.$key.'=>$'.$item.'): ';
 
         // 设置了索引项
         if (isset($tag['index'])) {
             $index = $tag['index'];
             if (isset($tag['mod'])) {
                 $mod = (int) $tag['mod'];
-                $parseStr .= '$mod = ($' . $index . ' % ' . $mod . '); ';
+                $parseStr .= '$mod = ($'.$index.' % '.$mod.'); ';
             }
-            $parseStr .= '++$' . $index . '; ';
+            $parseStr .= '++$'.$index.'; ';
         }
 
         $parseStr .= '?>';
         // 循环体中的内容
         $parseStr .= $content;
-        $parseStr .= '<?php endforeach; endif; else: echo "' . $empty . '" ;endif; ?>';
+        $parseStr .= '<?php endforeach; endif; else: echo "'.$empty.'" ;endif; ?>';
 
         if (!empty($parseStr)) {
             return $parseStr;
@@ -227,7 +227,7 @@ 
     {
         $condition = !empty($tag['expression']) ? $tag['expression'] : $tag['condition'];
         $condition = $this->parseCondition($condition);
-        $parseStr  = '<?php if(' . $condition . '): ?>' . $content . '<?php endif; ?>';
+        $parseStr  = '<?php if('.$condition.'): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -244,7 +244,7 @@ 
     {
         $condition = !empty($tag['expression']) ? $tag['expression'] : $tag['condition'];
         $condition = $this->parseCondition($condition);
-        $parseStr  = '<?php elseif(' . $condition . '): ?>';
+        $parseStr  = '<?php elseif('.$condition.'): ?>';
 
         return $parseStr;
     }
@@ -280,7 +280,7 @@ 
     {
         $name     = !empty($tag['expression']) ? $tag['expression'] : $tag['name'];
         $name     = $this->autoBuildVar($name);
-        $parseStr = '<?php switch(' . $name . '): ?>' . $content . '<?php endswitch; ?>';
+        $parseStr = '<?php switch('.$name.'): ?>'.$content.'<?php endswitch; ?>';
 
         return $parseStr;
     }
@@ -299,18 +299,18 @@ 
 
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($value);
-            $value = 'case ' . $value . ':';
+            $value = 'case '.$value.':';
         } elseif (strpos($value, '|')) {
             $values = explode('|', $value);
             $value  = '';
             foreach ($values as $val) {
-                $value .= 'case "' . addslashes($val) . '":';
+                $value .= 'case "'.addslashes($val).'":';
             }
         } else {
-            $value = 'case "' . $value . '":';
+            $value = 'case "'.$value.'":';
         }
 
-        $parseStr = '<?php ' . $value . ' ?>' . $content;
+        $parseStr = '<?php '.$value.' ?>'.$content;
         $isBreak  = isset($tag['break']) ? $tag['break'] : '';
 
         if ('' == $isBreak || $isBreak) {
@@ -355,7 +355,7 @@ 
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($value);
         } else {
-            $value = '\'' . $value . '\'';
+            $value = '\''.$value.'\'';
         }
 
         switch ($type) {
@@ -366,8 +366,8 @@ 
                 $type = 'neq';
                 break;
         }
-        $type     = $this->parseCondition(' ' . $type . ' ');
-        $parseStr = '<?php if(' . $name . ' ' . $type . ' ' . $value . '): ?>' . $content . '<?php endif; ?>';
+        $type     = $this->parseCondition(' '.$type.' ');
+        $parseStr = '<?php if('.$name.' '.$type.' '.$value.'): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -393,19 +393,19 @@ 
 
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($value);
-            $str   = 'is_array(' . $value . ')?' . $value . ':explode(\',\',' . $value . ')';
+            $str   = 'is_array('.$value.')?'.$value.':explode(\',\','.$value.')';
         } else {
-            $value = '"' . $value . '"';
-            $str   = 'explode(\',\',' . $value . ')';
+            $value = '"'.$value.'"';
+            $str   = 'explode(\',\','.$value.')';
         }
 
         if ('between' == $type) {
-            $parseStr = '<?php $_RANGE_VAR_=' . $str . ';if(' . $name . '>= $_RANGE_VAR_[0] && ' . $name . '<= $_RANGE_VAR_[1]):?>' . $content . '<?php endif; ?>';
+            $parseStr = '<?php $_RANGE_VAR_='.$str.';if('.$name.'>= $_RANGE_VAR_[0] && '.$name.'<= $_RANGE_VAR_[1]):?>'.$content.'<?php endif; ?>';
         } elseif ('notbetween' == $type) {
-            $parseStr = '<?php $_RANGE_VAR_=' . $str . ';if(' . $name . '<$_RANGE_VAR_[0] || ' . $name . '>$_RANGE_VAR_[1]):?>' . $content . '<?php endif; ?>';
+            $parseStr = '<?php $_RANGE_VAR_='.$str.';if('.$name.'<$_RANGE_VAR_[0] || '.$name.'>$_RANGE_VAR_[1]):?>'.$content.'<?php endif; ?>';
         } else {
             $fun      = ('in' == $type) ? 'in_array' : '!in_array';
-            $parseStr = '<?php if(' . $fun . '((' . $name . '), ' . $str . ')): ?>' . $content . '<?php endif; ?>';
+            $parseStr = '<?php if('.$fun.'(('.$name.'), '.$str.')): ?>'.$content.'<?php endif; ?>';
         }
 
         return $parseStr;
@@ -424,7 +424,7 @@ 
     {
         $name     = $tag['name'];
         $name     = $this->autoBuildVar($name);
-        $parseStr = '<?php if(isset(' . $name . ')): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(isset('.$name.')): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -442,7 +442,7 @@ 
     {
         $name     = $tag['name'];
         $name     = $this->autoBuildVar($name);
-        $parseStr = '<?php if(!isset(' . $name . ')): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(!isset('.$name.')): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -460,7 +460,7 @@ 
     {
         $name     = $tag['name'];
         $name     = $this->autoBuildVar($name);
-        $parseStr = '<?php if(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator ) && ' . $name . '->isEmpty())): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(empty('.$name.') || (('.$name.' instanceof \think\Collection || '.$name.' instanceof \think\Paginator ) && '.$name.'->isEmpty())): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -478,7 +478,7 @@ 
     {
         $name     = $tag['name'];
         $name     = $this->autoBuildVar($name);
-        $parseStr = '<?php if(!(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator ) && ' . $name . '->isEmpty()))): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(!(empty('.$name.') || (('.$name.' instanceof \think\Collection || '.$name.' instanceof \think\Paginator ) && '.$name.'->isEmpty()))): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -494,7 +494,7 @@ 
     public function tagDefined($tag, $content)
     {
         $name     = $tag['name'];
-        $parseStr = '<?php if(defined("' . $name . '")): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(defined("'.$name.'")): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -510,7 +510,7 @@ 
     public function tagNotdefined($tag, $content)
     {
         $name     = $tag['name'];
-        $parseStr = '<?php if(!defined("' . $name . '")): ?>' . $content . '<?php endif; ?>';
+        $parseStr = '<?php if(!defined("'.$name.'")): ?>'.$content.'<?php endif; ?>';
 
         return $parseStr;
     }
@@ -535,8 +535,8 @@ 
         if (isset($tag['value'])) {
             $name = $tag['value'];
             $name = $this->autoBuildVar($name);
-            $name = 'isset(' . $name . ')';
-            $parseStr .= '<?php if(' . $name . '): ?>';
+            $name = 'isset('.$name.')';
+            $parseStr .= '<?php if('.$name.'): ?>';
             $endStr = '<?php endif; ?>';
         }
 
@@ -547,18 +547,18 @@ 
             $type = strtolower(substr(strrchr($val, '.'), 1));
             switch ($type) {
                 case 'js':
-                    $parseStr .= '<script type="text/javascript" src="' . $val . '"></script>';
+                    $parseStr .= '<script type="text/javascript" src="'.$val.'"></script>';
                     break;
                 case 'css':
-                    $parseStr .= '<link rel="stylesheet" type="text/css" href="' . $val . '" />';
+                    $parseStr .= '<link rel="stylesheet" type="text/css" href="'.$val.'" />';
                     break;
                 case 'php':
-                    $parseStr .= '<?php include "' . $val . '"; ?>';
+                    $parseStr .= '<?php include "'.$val.'"; ?>';
                     break;
             }
         }
 
-        return $parseStr . $endStr;
+        return $parseStr.$endStr;
     }
 
     /**
@@ -578,10 +578,10 @@ 
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($tag['value']);
         } else {
-            $value = '\'' . $tag['value'] . '\'';
+            $value = '\''.$tag['value'].'\'';
         }
 
-        $parseStr = '<?php ' . $name . ' = ' . $value . '; ?>';
+        $parseStr = '<?php '.$name.' = '.$value.'; ?>';
 
         return $parseStr;
     }
@@ -597,16 +597,16 @@ 
      */
     public function tagDefine($tag, $content)
     {
-        $name = '\'' . $tag['name'] . '\'';
+        $name = '\''.$tag['name'].'\'';
         $flag = substr($tag['value'], 0, 1);
 
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($tag['value']);
         } else {
-            $value = '\'' . $tag['value'] . '\'';
+            $value = '\''.$tag['value'].'\'';
         }
 
-        $parseStr = '<?php define(' . $name . ', ' . $value . '); ?>';
+        $parseStr = '<?php define('.$name.', '.$value.'); ?>';
 
         return $parseStr;
     }
@@ -659,8 +659,8 @@ 
             }
         }
 
-        $parseStr = '<?php $__FOR_START_' . $rand . '__=' . $start . ';$__FOR_END_' . $rand . '__=' . $end . ';';
-        $parseStr .= 'for($' . $name . '=$__FOR_START_' . $rand . '__;' . $this->parseCondition('$' . $name . ' ' . $comparison . ' $__FOR_END_' . $rand . '__') . ';$' . $name . '+=' . $step . '){ ?>';
+        $parseStr = '<?php $__FOR_START_'.$rand.'__='.$start.';$__FOR_END_'.$rand.'__='.$end.';';
+        $parseStr .= 'for($'.$name.'=$__FOR_START_'.$rand.'__;'.$this->parseCondition('$'.$name.' '.$comparison.' $__FOR_END_'.$rand.'__').';$'.$name.'+='.$step.'){ ?>';
         $parseStr .= $content;
         $parseStr .= '<?php } ?>';
 
@@ -682,7 +682,7 @@ 
         $suffix = isset($tag['suffix']) ? $tag['suffix'] : 'true';
         $domain = isset($tag['domain']) ? $tag['domain'] : 'false';
 
-        return '<?php echo url("' . $url . '","' . $vars . '",' . $suffix . ',' . $domain . ');?>';
+        return '<?php echo url("'.$url.'","'.$vars.'",'.$suffix.','.$domain.');?>';
     }
 
     /**
@@ -707,17 +707,17 @@ 
         $name = !empty($tag['name']) ? $tag['name'] : 'func';
         $vars = !empty($tag['vars']) ? $tag['vars'] : '';
         $call = !empty($tag['call']) ? $tag['call'] : '';
-        $use  = ['&$' . $name];
+        $use  = ['&$'.$name];
 
         if (!empty($tag['use'])) {
             foreach (explode(',', $tag['use']) as $val) {
-                $use[] = '&' . ltrim(trim($val), '&');
+                $use[] = '&'.ltrim(trim($val), '&');
             }
         }
 
-        $parseStr = '<?php $' . $name . '=function(' . $vars . ') use(' . implode(',', $use) . ') {';
-        $parseStr .= ' ?>' . $content . '<?php }; ';
-        $parseStr .= $call ? '$' . $name . '(' . $call . '); ?>' : '?>';
+        $parseStr = '<?php $'.$name.'=function('.$vars.') use('.implode(',', $use).') {';
+        $parseStr .= ' ?>'.$content.'<?php }; ';
+        $parseStr .= $call ? '$'.$name.'('.$call.'); ?>' : '?>';
 
         return $parseStr;
     }

library/think/template/driver/File.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
         // 生成模板缓存文件
         if (false === file_put_contents($cacheFile, $content)) {
-            throw new Exception('cache write error:' . $cacheFile, 11602);
+            throw new Exception('cache write error:'.$cacheFile, 11602);
         }
     }
 

library/think/template/TagLib.php

Spacing +18 added lines, -18 removed lines

@@ -87,16 +87,16 @@ 
     public function parseTag(&$content, $lib = '')
     {
         $tags = [];
-        $lib  = $lib ? strtolower($lib) . ':' : '';
+        $lib  = $lib ? strtolower($lib).':' : '';
 
         foreach ($this->tags as $name => $val) {
             $close                      = !isset($val['close']) || $val['close'] ? 1 : 0;
-            $tags[$close][$lib . $name] = $name;
+            $tags[$close][$lib.$name] = $name;
             if (isset($val['alias'])) {
                 // 别名设置
                 $array = (array) $val['alias'];
                 foreach (explode(',', $array[0]) as $v) {
-                    $tags[$close][$lib . $v] = $name;
+                    $tags[$close][$lib.$v] = $name;
                 }
             }
         }
@@ -136,11 +136,11 @@ 
                 foreach ($nodes as $pos => $node) {
                     // 对应的标签名
                     $name  = $tags[1][$node['name']];
-                    $alias = $lib . $name != $node['name'] ? ($lib ? strstr($node['name'], $lib) : $node['name']) : '';
+                    $alias = $lib.$name != $node['name'] ? ($lib ? strstr($node['name'], $lib) : $node['name']) : '';
 
                     // 解析标签属性
                     $attrs  = $this->parseAttr($node['begin'][0], $name, $alias);
-                    $method = 'tag' . $name;
+                    $method = 'tag'.$name;
 
                     // 读取标签库中对应的标签内容 replace[0]用来替换标签头，replace[1]用来替换标签尾
                     $replace = explode($break, $this->$method($attrs, $break));
@@ -175,13 +175,13 @@ 
         // 自闭合标签
         if (!empty($tags[0])) {
             $regex   = $this->getRegex(array_keys($tags[0]), 0);
-            $content = preg_replace_callback($regex, function ($matches) use (&$tags, &$lib) {
+            $content = preg_replace_callback($regex, function($matches) use (&$tags, &$lib) {
                 // 对应的标签名
                 $name  = $tags[0][strtolower($matches[1])];
-                $alias = $lib . $name != $matches[1] ? ($lib ? strstr($matches[1], $lib) : $matches[1]) : '';
+                $alias = $lib.$name != $matches[1] ? ($lib ? strstr($matches[1], $lib) : $matches[1]) : '';
                 // 解析标签属性
                 $attrs  = $this->parseAttr($matches[0], $name, $alias);
-                $method = 'tag' . $name;
+                $method = 'tag'.$name;
                 return $this->$method($attrs, '');
             }, $content);
         }
@@ -206,20 +206,20 @@ 
         if ($single) {
             if ($close) {
                 // 如果是闭合标签
-                $regex = $begin . '(?:(' . $tagName . ')\b(?>[^' . $end . ']*)|\/(' . $tagName . '))' . $end;
+                $regex = $begin.'(?:('.$tagName.')\b(?>[^'.$end.']*)|\/('.$tagName.'))'.$end;
             } else {
-                $regex = $begin . '(' . $tagName . ')\b(?>[^' . $end . ']*)' . $end;
+                $regex = $begin.'('.$tagName.')\b(?>[^'.$end.']*)'.$end;
             }
         } else {
             if ($close) {
                 // 如果是闭合标签
-                $regex = $begin . '(?:(' . $tagName . ')\b(?>(?:(?!' . $end . ').)*)|\/(' . $tagName . '))' . $end;
+                $regex = $begin.'(?:('.$tagName.')\b(?>(?:(?!'.$end.').)*)|\/('.$tagName.'))'.$end;
             } else {
-                $regex = $begin . '(' . $tagName . ')\b(?>(?:(?!' . $end . ').)*)' . $end;
+                $regex = $begin.'('.$tagName.')\b(?>(?:(?!'.$end.').)*)'.$end;
             }
         }
 
-        return '/' . $regex . '/is';
+        return '/'.$regex.'/is';
     }
 
     /**
@@ -266,7 +266,7 @@ 
                 $must = explode(',', $tag['must']);
                 foreach ($must as $name) {
                     if (!isset($result[$name])) {
-                        throw new Exception('tag attr must:' . $name);
+                        throw new Exception('tag attr must:'.$name);
                     }
                 }
             }
@@ -275,7 +275,7 @@ 
             if (!empty($this->tags[$name]['expression'])) {
                 static $_taglibs;
                 if (!isset($_taglibs[$name])) {
-                    $_taglibs[$name][0] = strlen($this->tpl->config('taglib_begin_origin') . $name);
+                    $_taglibs[$name][0] = strlen($this->tpl->config('taglib_begin_origin').$name);
                     $_taglibs[$name][1] = strlen($this->tpl->config('taglib_end_origin'));
                 }
                 $result['expression'] = substr($str, $_taglibs[$name][0], -$_taglibs[$name][1]);
@@ -283,7 +283,7 @@ 
                 $result['expression'] = rtrim($result['expression'], '/');
                 $result['expression'] = trim($result['expression']);
             } elseif (empty($this->tags[$name]) || !empty($this->tags[$name]['attr'])) {
-                throw new Exception('tag error:' . $name);
+                throw new Exception('tag error:'.$name);
             }
         }
 
@@ -299,7 +299,7 @@ 
     public function parseCondition($condition)
     {
         if (!strpos($condition, '::') && strpos($condition, ':')) {
-            $condition = ' ' . substr(strstr($condition, ':'), 1);
+            $condition = ' '.substr(strstr($condition, ':'), 1);
         }
 
         $condition = str_ireplace(array_keys($this->comparison), array_values($this->comparison), $condition);
@@ -330,7 +330,7 @@ 
             }
 
             // 不以$开头并且也不是常量，自动补上$前缀
-            $name = '$' . $name;
+            $name = '$'.$name;
         }
 
         $this->tpl->parseVar($name);

library/think/Middleware.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
             if (isset($this->config[$middleware])) {
                 $middleware = $this->config[$middleware];
             } else {
-                $middleware = $this->config['default_namespace'] . $middleware;
+                $middleware = $this->config['default_namespace'].$middleware;
             }
         }
 
@@ -171,7 +171,7 @@ 
 
     protected function resolve($type = 'route')
     {
-        return function (Request $request) use ($type) {
+        return function(Request $request) use ($type) {
 
             $middleware = array_shift($this->queue[$type]);
 

library/think/Request.php

Spacing +21 added lines, -21 removed lines

@@ -331,7 +331,7 @@ 
             return call_user_func_array($this->hook[$method], $args);
         }
 
-        throw new Exception('method not exists:' . static::class . '->' . $method);
+        throw new Exception('method not exists:'.static::class.'->'.$method);
     }
 
     /**
@@ -385,7 +385,7 @@ 
 
         if (isset($info['port'])) {
             $server['SERVER_PORT'] = $info['port'];
-            $server['HTTP_HOST']   = $server['HTTP_HOST'] . ':' . $info['port'];
+            $server['HTTP_HOST']   = $server['HTTP_HOST'].':'.$info['port'];
         }
 
         if (isset($info['user'])) {
@@ -423,7 +423,7 @@ 
             $options['get'] = isset($options['get']) ? array_merge($get, $options['get']) : $get;
         }
 
-        $server['REQUEST_URI']  = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
+        $server['REQUEST_URI']  = $info['path'].('' !== $queryString ? '?'.$queryString : '');
         $server['QUERY_STRING'] = $queryString;
         $options['cookie']      = $cookie;
         $options['param']       = $params;
@@ -433,7 +433,7 @@ 
         $options['baseUrl']     = $info['path'];
         $options['pathinfo']    = '/' == $info['path'] ? '/' : ltrim($info['path'], '/');
         $options['method']      = $server['REQUEST_METHOD'];
-        $options['domain']      = isset($info['scheme']) ? $info['scheme'] . '://' . $server['HTTP_HOST'] : '';
+        $options['domain']      = isset($info['scheme']) ? $info['scheme'].'://'.$server['HTTP_HOST'] : '';
         $options['content']     = $content;
 
         $request = new static();
@@ -454,7 +454,7 @@ 
      */
     public function domain($port = false)
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -469,7 +469,7 @@ 
         if (!$root) {
             $item  = explode('.', $this->host(true));
             $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;
@@ -549,13 +549,13 @@ 
             } elseif ($this->server('REQUEST_URI')) {
                 $this->url = $this->server('REQUEST_URI');
             } elseif ($this->server('ORIG_PATH_INFO')) {
-                $this->url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+                $this->url = $this->server('ORIG_PATH_INFO').(!empty($this->server('QUERY_STRING')) ? '?'.$this->server('QUERY_STRING') : '');
             } else {
                 $this->url = '';
             }
         }
 
-        return $complete ? $this->domain() . $this->url : $this->url;
+        return $complete ? $this->domain().$this->url : $this->url;
     }
 
     /**
@@ -583,7 +583,7 @@ 
             $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
 
-        return $domain ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return $domain ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -604,8 +604,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')));
                 }
@@ -613,7 +613,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $domain ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $domain ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -644,7 +644,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $domain ? $this->domain() . $this->root : $this->root;
+        return $domain ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -658,7 +658,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -724,10 +724,10 @@ 
                 $this->path = $pathinfo;
             } elseif ($suffix) {
                 // 去除正常的URL后缀
-                $this->path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+                $this->path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
             } else {
                 // 允许任何后缀访问
-                $this->path = preg_replace('/\.' . $this->ext() . '$/i', '', $pathinfo);
+                $this->path = preg_replace('/\.'.$this->ext().'$/i', '', $pathinfo);
             }
         }
 
@@ -1513,7 +1513,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;
         }
@@ -2028,7 +2028,7 @@ 
         $token = call_user_func($type, $this->server('REQUEST_TIME_FLOAT'));
 
         if ($this->isAjax()) {
-            header($name . ': ' . $token);
+            header($name.': '.$token);
         }
 
         facade\Session::set($name, $token);
@@ -2083,12 +2083,12 @@ 
         if (false !== strpos($key, ':')) {
             $param = $this->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 ('[' . $this->ext() . ']' == $key) {
+            if ('['.$this->ext().']' == $key) {
                 // 缓存某个后缀的请求
                 $key = md5($this->url());
             } else {

library/think/cache/driver/Redis.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $this->handler = new \Redis;
 
             if ($this->options['persistent']) {
-                $this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']);
+                $this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_'.$this->options['select']);
             } else {
                 $this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']);
             }

library/think/cache/driver/File.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
         }
 
         if (empty($this->options['path'])) {
-            $this->options['path'] = Container::get('app')->getRuntimePath() . 'cache' . DIRECTORY_SEPARATOR;
+            $this->options['path'] = Container::get('app')->getRuntimePath().'cache'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->options['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -82,14 +82,14 @@ 
 
         if ($this->options['cache_subdir']) {
             // 使用子目录
-            $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2);
+            $name = substr($name, 0, 2).DIRECTORY_SEPARATOR.substr($name, 2);
         }
 
         if ($this->options['prefix']) {
-            $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
+            $name = $this->options['prefix'].DIRECTORY_SEPARATOR.$name;
         }
 
-        $filename = $this->options['path'] . $name . '.php';
+        $filename = $this->options['path'].$name.'.php';
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {
@@ -184,7 +184,7 @@ 
             $data = gzcompress($data, 3);
         }
 
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
         $result = file_put_contents($filename, $data);
 
         if ($result) {
@@ -272,11 +272,11 @@ 
 
         $this->writeTimes++;
 
-        $files = (array) glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DIRECTORY_SEPARATOR : '') . '*');
+        $files = (array) glob($this->options['path'].($this->options['prefix'] ? $this->options['prefix'].DIRECTORY_SEPARATOR : '').'*');
 
         foreach ($files as $path) {
             if (is_dir($path)) {
-                $matches = glob($path . DIRECTORY_SEPARATOR . '*.php');
+                $matches = glob($path.DIRECTORY_SEPARATOR.'*.php');
                 if (is_array($matches)) {
                     array_map('unlink', $matches);
                 }

library/think/cache/driver/Sqlite.php

Spacing +7 added lines, -7 removed lines

@@ -57,7 +57,7 @@ 
      */
     protected function getCacheKey($name)
     {
-        return $this->options['prefix'] . sqlite_escape_string($name);
+        return $this->options['prefix'].sqlite_escape_string($name);
     }
 
     /**
@@ -70,7 +70,7 @@ 
     {
         $name = $this->getCacheKey($name);
 
-        $sql    = 'SELECT value FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\' AND (expire=0 OR expire >' . time() . ') LIMIT 1';
+        $sql    = 'SELECT value FROM '.$this->options['table'].' WHERE var=\''.$name.'\' AND (expire=0 OR expire >'.time().') LIMIT 1';
         $result = sqlite_query($this->handler, $sql);
 
         return sqlite_num_rows($result);
@@ -89,7 +89,7 @@ 
 
         $name = $this->getCacheKey($name);
 
-        $sql = 'SELECT value FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\' AND (expire=0 OR expire >' . time() . ') LIMIT 1';
+        $sql = 'SELECT value FROM '.$this->options['table'].' WHERE var=\''.$name.'\' AND (expire=0 OR expire >'.time().') LIMIT 1';
 
         $result = sqlite_query($this->handler, $sql);
 
@@ -144,7 +144,7 @@ 
             $tag = '';
         }
 
-        $sql = 'REPLACE INTO ' . $this->options['table'] . ' (var, value, expire, tag) VALUES (\'' . $name . '\', \'' . $value . '\', \'' . $expire . '\', \'' . $tag . '\')';
+        $sql = 'REPLACE INTO '.$this->options['table'].' (var, value, expire, tag) VALUES (\''.$name.'\', \''.$value.'\', \''.$expire.'\', \''.$tag.'\')';
 
         if (sqlite_query($this->handler, $sql)) {
             return true;
@@ -201,7 +201,7 @@ 
 
         $name = $this->getCacheKey($name);
 
-        $sql = 'DELETE FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\'';
+        $sql = 'DELETE FROM '.$this->options['table'].' WHERE var=\''.$name.'\'';
         sqlite_query($this->handler, $sql);
 
         return true;
@@ -217,14 +217,14 @@ 
     {
         if ($tag) {
             $name = sqlite_escape_string($this->getTagKey($tag));
-            $sql  = 'DELETE FROM ' . $this->options['table'] . ' WHERE tag=\'' . $name . '\'';
+            $sql  = 'DELETE FROM '.$this->options['table'].' WHERE tag=\''.$name.'\'';
             sqlite_query($this->handler, $sql);
             return true;
         }
 
         $this->writeTimes++;
 
-        $sql = 'DELETE FROM ' . $this->options['table'];
+        $sql = 'DELETE FROM '.$this->options['table'];
 
         sqlite_query($this->handler, $sql);