top-think / framework

library/think/response/Xml.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             if (0 !== strpos($data, '<?xml')) {
                 $encoding = $this->options['encoding'];
                 $xml      = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
-                $data     = $xml . $data;
+                $data     = $xml.$data;
             }
             return $data;
         }

library/think/response/Download.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
     protected function output($data)
     {
         if (!$this->isContent && !is_file($data)) {
-            throw new Exception('file not exists:' . $data);
+            throw new Exception('file not exists:'.$data);
         }
 
         ob_end_clean();
@@ -52,13 +52,13 @@ 
 
         $this->header['Pragma']                    = 'public';
         $this->header['Content-Type']              = $mimeType ?: 'application/octet-stream';
-        $this->header['Cache-control']             = 'max-age=' . $this->expire;
-        $this->header['Content-Disposition']       = $this->openinBrowser ? 'inline' : 'attachment; filename="' . $name . '"';
+        $this->header['Cache-control']             = 'max-age='.$this->expire;
+        $this->header['Content-Disposition']       = $this->openinBrowser ? 'inline' : 'attachment; filename="'.$name.'"';
         $this->header['Content-Length']            = $size;
         $this->header['Content-Transfer-Encoding'] = 'binary';
-        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
+        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire).' GMT';
 
-        $this->lastModified(gmdate('D, d M Y H:i:s', time()) . ' GMT');
+        $this->lastModified(gmdate('D, d M Y H:i:s', time()).' GMT');
 
         $data = $this->isContent ? $data : file_get_contents($data);
         return $data;
@@ -129,7 +129,7 @@ 
         $this->name = $filename;
 
         if ($extension && false === strpos($filename, '.')) {
-            $this->name .= '.' . pathinfo($this->data, PATHINFO_EXTENSION);
+            $this->name .= '.'.pathinfo($this->data, PATHINFO_EXTENSION);
         }
 
         return $this;

library/think/Lang.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
         foreach ($file as $_file) {
             if (is_file($_file)) {
                 // 记录加载信息
-                $this->app->log('[ LANG ] ' . $_file);
+                $this->app->log('[ LANG ] '.$_file);
                 $_lang = include $_file;
                 if (is_array($_lang)) {
                     $lang = array_change_key_case($_lang) + $lang;

library/think/Process.php

Spacing +5 added lines, -5 removed lines

@@ -221,9 +221,9 @@ 
         $commandline = $this->commandline;
 
         if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
-            $commandline = 'cmd /V:ON /E:ON /C "(' . $commandline . ')';
+            $commandline = 'cmd /V:ON /E:ON /C "('.$commandline.')';
             foreach ($this->processPipes->getFiles() as $offset => $filename) {
-                $commandline .= ' ' . $offset . '>' . Utils::escapeArgument($filename);
+                $commandline .= ' '.$offset.'>'.Utils::escapeArgument($filename);
             }
             $commandline .= '"';
 
@@ -861,7 +861,7 @@ 
      */
     public function setEnv(array $env)
 {
-        $env = array_filter($env, function ($value) {
+        $env = array_filter($env, function($value) {
             return !is_array($value);
         });
 
@@ -1036,7 +1036,7 @@ 
 
             $descriptors = array_merge($descriptors, [['pipe', 'w']]);
 
-            $this->commandline = '(' . $this->commandline . ') 3>/dev/null; code=$?; echo $code >&3; exit $code';
+            $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code';
         }
 
         return $descriptors;
@@ -1051,7 +1051,7 @@ 
     protected function buildCallback($callback)
 {
         $out      = self::OUT;
-        $callback = function ($type, $data) use ($callback, $out) {
+        $callback = function($type, $data) use ($callback, $out) {
             if ($out == $type) {
                 $this->addOutput($data);
             } else {

library/think/Template.php

Spacing +69 added lines, -69 removed lines

@@ -87,7 +87,7 @@ 
     public function __construct(App $app, array $config = [])
     {
         $this->app                  = $app;
-        $this->config['cache_path'] = $app->getRuntimePath() . 'temp/';
+        $this->config['cache_path'] = $app->getRuntimePath().'temp/';
         $this->config               = array_merge($this->config, $config);
 
         $this->config['taglib_begin_origin'] = $this->config['taglib_begin'];
@@ -210,7 +210,7 @@ 
         $template = $this->parseTemplateFile($template);
 
         if ($template) {
-            $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($this->config['layout_on'] . $this->config['layout_name'] . $template) . '.' . ltrim($this->config['cache_suffix'], '.');
+            $cacheFile = $this->config['cache_path'].$this->config['cache_prefix'].md5($this->config['layout_on'].$this->config['layout_name'].$template).'.'.ltrim($this->config['cache_suffix'], '.');
 
             if (!$this->checkCache($cacheFile)) {
                 // 缓存无效 重新模板编译
@@ -255,7 +255,7 @@ 
             $this->config($config);
         }
 
-        $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($content) . '.' . ltrim($this->config['cache_suffix'], '.');
+        $cacheFile = $this->config['cache_path'].$this->config['cache_prefix'].md5($content).'.'.ltrim($this->config['cache_suffix'], '.');
 
         if (!$this->checkCache($cacheFile)) {
             // 缓存无效 模板编译
@@ -394,7 +394,7 @@ 
         $content = str_replace(array_keys($replace), array_values($replace), $content);
 
         // 添加安全代码及模板引用记录
-        $content = '<?php /*' . serialize($this->includeFile) . '*/ ?>' . "\n" . $content;
+        $content = '<?php /*'.serialize($this->includeFile).'*/ ?>'."\n".$content;
         // 编译存储
         $this->storage->write($cacheFile, $content);
 
@@ -482,7 +482,7 @@ 
     private function parsePhp(&$content)
     {
         // 短标签的情况要将<?标签用echo方式输出 否则无法正常输出xml标识
-        $content = preg_replace('/(<\?(?!php|=|$))/i', '<?php echo \'\\1\'; ?>' . "\n", $content);
+        $content = preg_replace('/(<\?(?!php|=|$))/i', '<?php echo \'\\1\'; ?>'."\n", $content);
 
         // PHP语法检查
         if ($this->config['tpl_deny_php'] && false !== strpos($content, '<?php')) {
@@ -529,7 +529,7 @@ 
     private function parseInclude(&$content)
     {
         $regex = $this->getRegex('include');
-        $func  = function ($template) use (&$func, &$regex, &$content) {
+        $func  = function($template) use (&$func, &$regex, &$content) {
             if (preg_match_all($regex, $template, $matches, PREG_SET_ORDER)) {
                 foreach ($matches as $match) {
                     $array = $this->parseAttr($match[0]);
@@ -545,7 +545,7 @@ 
                             $v = $this->get(substr($v, 1));
                         }
 
-                        $parseStr = str_replace('[' . $k . ']', $v, $parseStr);
+                        $parseStr = str_replace('['.$k.']', $v, $parseStr);
                     }
 
                     $content = str_replace($match[0], $parseStr, $content);
@@ -569,10 +569,10 @@ 
     private function parseExtend(&$content)
     {
         $regex  = $this->getRegex('extend');
-        $array  = $blocks  = $baseBlocks  = [];
+        $array  = $blocks = $baseBlocks = [];
         $extend = '';
 
-        $func = function ($template) use (&$func, &$regex, &$array, &$extend, &$blocks, &$baseBlocks) {
+        $func = function($template) use (&$func, &$regex, &$array, &$extend, &$blocks, &$baseBlocks) {
             if (preg_match($regex, $template, $matches)) {
                 if (!isset($array[$matches['name']])) {
                     $array[$matches['name']] = 1;
@@ -609,7 +609,7 @@ 
                     if (!empty($children[$name])) {
                         // 如果包含有子block标签
                         foreach ($children[$name] as $key) {
-                            $replace = str_replace($baseBlocks[$key]['begin'] . $baseBlocks[$key]['content'] . $baseBlocks[$key]['end'], $blocks[$key]['content'], $replace);
+                            $replace = str_replace($baseBlocks[$key]['begin'].$baseBlocks[$key]['content'].$baseBlocks[$key]['end'], $blocks[$key]['content'], $replace);
                         }
                     }
 
@@ -622,7 +622,7 @@ 
                             $parent = $val['parent'];
 
                             if (isset($blocks[$parent])) {
-                                $blocks[$parent]['content'] = str_replace($blocks[$name]['begin'] . $blocks[$name]['content'] . $blocks[$name]['end'], $replace, $blocks[$parent]['content']);
+                                $blocks[$parent]['content'] = str_replace($blocks[$name]['begin'].$blocks[$name]['content'].$blocks[$name]['end'], $replace, $blocks[$parent]['content']);
                             }
 
                             $blocks[$name]['content'] = $replace;
@@ -638,7 +638,7 @@ 
 
                     if (!$val['parent']) {
                         // 替换模板中的顶级block标签
-                        $extend = str_replace($val['begin'] . $val['content'] . $val['end'], $replace, $extend);
+                        $extend = str_replace($val['begin'].$val['content'].$val['end'], $replace, $extend);
                     }
                 }
             }
@@ -768,7 +768,7 @@ 
             $className = $tagLib;
             $tagLib    = substr($tagLib, strrpos($tagLib, '\\') + 1);
         } else {
-            $className = '\\think\\template\\taglib\\' . ucwords($tagLib);
+            $className = '\\think\\template\\taglib\\'.ucwords($tagLib);
         }
 
         $tLib = new $className($this);
@@ -837,25 +837,25 @@ 
                                 // $name为对象或是自动识别，或者含有函数
                                 if (isset($array[1])) {
                                     $this->parseVar($array[2]);
-                                    $name .= $array[1] . $array[2];
+                                    $name .= $array[1].$array[2];
                                 }
 
                                 switch ($first) {
                                     case '?':
                                         $this->parseVarFunction($name);
-                                        $str = '<?php echo (' . $name . ') ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
+                                        $str = '<?php echo ('.$name.') ? '.$name.' : '.substr($str, 1).'; ?>';
                                         break;
                                     case '=':
-                                        $str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>';
+                                        $str = '<?php if('.$name.') echo '.substr($str, 1).'; ?>';
                                         break;
                                     default:
-                                        $str = '<?php echo ' . $name . '?' . $str . '; ?>';
+                                        $str = '<?php echo '.$name.'?'.$str.'; ?>';
                                 }
                             } else {
                                 if (isset($array[1])) {
                                     $express = true;
                                     $this->parseVar($array[2]);
-                                    $express = $name . $array[1] . $array[2];
+                                    $express = $name.$array[1].$array[2];
                                 } else {
                                     $express = false;
                                 }
@@ -871,15 +871,15 @@ 
                                 switch ($first) {
                                     case '?':
                                         // {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
-                                        $str = '<?php echo ' . ($express ?: 'isset(' . $name . ')') . ' ? ' . $this->parseVarFunction($name) . ' : ' . $str . '; ?>';
+                                        $str = '<?php echo '.($express ?: 'isset('.$name.')').' ? '.$this->parseVarFunction($name).' : '.$str.'; ?>';
                                         break;
                                     case '=':
                                         // {$varname?='xxx'} $varname为真时才输出xxx
-                                        $str = '<?php if(' . ($express ?: '!empty(' . $name . ')') . ') echo ' . $str . '; ?>';
+                                        $str = '<?php if('.($express ?: '!empty('.$name.')').') echo '.$str.'; ?>';
                                         break;
                                     case ':':
                                         // {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
-                                        $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . ' ? ' . $this->parseVarFunction($name) . ' : ' . $str . '; ?>';
+                                        $str = '<?php echo '.($express ?: '!empty('.$name.')').' ? '.$this->parseVarFunction($name).' : '.$str.'; ?>';
                                         break;
                                     default:
                                         if (strpos($str, ':')) {
@@ -891,32 +891,32 @@ 
 
                                             $str = implode(' : ', $array);
                                         }
-                                        $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . ' ? ' . $str . '; ?>';
+                                        $str = '<?php echo '.($express ?: '!empty('.$name.')').' ? '.$str.'; ?>';
                                 }
                             }
                         } else {
                             $this->parseVar($str);
                             $this->parseVarFunction($str);
-                            $str = '<?php echo ' . $str . '; ?>';
+                            $str = '<?php echo '.$str.'; ?>';
                         }
                         break;
                     case ':':
                         // 输出某个函数的结果
                         $str = substr($str, 1);
                         $this->parseVar($str);
-                        $str = '<?php echo ' . $str . '; ?>';
+                        $str = '<?php echo '.$str.'; ?>';
                         break;
                     case '~':
                         // 执行某个函数
                         $str = substr($str, 1);
                         $this->parseVar($str);
-                        $str = '<?php ' . $str . '; ?>';
+                        $str = '<?php '.$str.'; ?>';
                         break;
                     case '-':
                     case '+':
                         // 输出计算
                         $this->parseVar($str);
-                        $str = '<?php echo ' . $str . '; ?>';
+                        $str = '<?php echo '.$str.'; ?>';
                         break;
                     case '/':
                         // 注释标签
@@ -927,7 +927,7 @@ 
                         break;
                     default:
                         // 未识别的标签直接返回
-                        $str = $this->config['tpl_begin'] . $str . $this->config['tpl_end'];
+                        $str = $this->config['tpl_begin'].$str.$this->config['tpl_end'];
                         break;
                 }
 
@@ -972,23 +972,23 @@ 
                             if (!empty($vars)) {
                                 $params = implode('.', $vars);
                                 if ('true' != $params) {
-                                    $params = '\'' . $params . '\'';
+                                    $params = '\''.$params.'\'';
                                 }
                             } else {
                                 $params = '';
                             }
 
-                            $parseStr = 'app(\'request\')->' . $method . '(' . $params . ')';
+                            $parseStr = 'app(\'request\')->'.$method.'('.$params.')';
                         } else {
                             switch ($this->config['tpl_var_identify']) {
                                 case 'array': // 识别为数组
-                                    $parseStr = $first . '[\'' . implode('\'][\'', $vars) . '\']';
+                                    $parseStr = $first.'[\''.implode('\'][\'', $vars).'\']';
                                     break;
                                 case 'obj': // 识别为对象
-                                    $parseStr = $first . '->' . implode('->', $vars);
+                                    $parseStr = $first.'->'.implode('->', $vars);
                                     break;
                                 default: // 自动判断数组或对象
-                                    $parseStr = '(is_array(' . $first . ')?' . $first . '[\'' . implode('\'][\'', $vars) . '\']:' . $first . '->' . implode('->', $vars) . ')';
+                                    $parseStr = '(is_array('.$first.')?'.$first.'[\''.implode('\'][\'', $vars).'\']:'.$first.'->'.implode('->', $vars).')';
                             }
                         }
                     } else {
@@ -1017,7 +1017,7 @@ 
         if (!$autoescape && false === strpos($varStr, '|')) {
             return $varStr;
         } elseif ($autoescape && !preg_match('/\|(\s)?raw(\||\s)?/i', $varStr)) {
-            $varStr .= '|' . $this->config['default_filter'];
+            $varStr .= '|'.$this->config['default_filter'];
         }
 
         static $_varFunctionList = [];
@@ -1052,28 +1052,28 @@ 
                     case 'raw':
                         break;
                     case 'date':
-                        $name = 'date(' . $args[1] . ',!is_numeric(' . $name . ')? strtotime(' . $name . ') : ' . $name . ')';
+                        $name = 'date('.$args[1].',!is_numeric('.$name.')? strtotime('.$name.') : '.$name.')';
                         break;
                     case 'first':
-                        $name = 'current(' . $name . ')';
+                        $name = 'current('.$name.')';
                         break;
                     case 'last':
-                        $name = 'end(' . $name . ')';
+                        $name = 'end('.$name.')';
                         break;
                     case 'upper':
-                        $name = 'strtoupper(' . $name . ')';
+                        $name = 'strtoupper('.$name.')';
                         break;
                     case 'lower':
-                        $name = 'strtolower(' . $name . ')';
+                        $name = 'strtolower('.$name.')';
                         break;
                     case 'format':
-                        $name = 'sprintf(' . $args[1] . ',' . $name . ')';
+                        $name = 'sprintf('.$args[1].','.$name.')';
                         break;
                     case 'default': // 特殊模板函数
                         if (false === strpos($name, '(')) {
-                            $name = '(isset(' . $name . ') && (' . $name . ' !== \'\')?' . $name . ':' . $args[1] . ')';
+                            $name = '(isset('.$name.') && ('.$name.' !== \'\')?'.$name.':'.$args[1].')';
                         } else {
-                            $name = '(' . $name . ' ?: ' . $args[1] . ')';
+                            $name = '('.$name.' ?: '.$args[1].')';
                         }
                         break;
                     default: // 通用模板函数
@@ -1113,34 +1113,34 @@ 
         if ($vars) {
             switch ($type) {
                 case 'SERVER':
-                    $parseStr = 'app(\'request\')->server(\'' . $param . '\')';
+                    $parseStr = 'app(\'request\')->server(\''.$param.'\')';
                     break;
                 case 'GET':
-                    $parseStr = 'app(\'request\')->get(\'' . $param . '\')';
+                    $parseStr = 'app(\'request\')->get(\''.$param.'\')';
                     break;
                 case 'POST':
-                    $parseStr = 'app(\'request\')->post(\'' . $param . '\')';
+                    $parseStr = 'app(\'request\')->post(\''.$param.'\')';
                     break;
                 case 'COOKIE':
-                    $parseStr = 'app(\'cookie\')->get(\'' . $param . '\')';
+                    $parseStr = 'app(\'cookie\')->get(\''.$param.'\')';
                     break;
                 case 'SESSION':
-                    $parseStr = 'app(\'session\')->get(\'' . $param . '\')';
+                    $parseStr = 'app(\'session\')->get(\''.$param.'\')';
                     break;
                 case 'ENV':
-                    $parseStr = 'app(\'request\')->env(\'' . $param . '\')';
+                    $parseStr = 'app(\'request\')->env(\''.$param.'\')';
                     break;
                 case 'REQUEST':
-                    $parseStr = 'app(\'request\')->request(\'' . $param . '\')';
+                    $parseStr = 'app(\'request\')->request(\''.$param.'\')';
                     break;
                 case 'CONST':
                     $parseStr = strtoupper($param);
                     break;
                 case 'LANG':
-                    $parseStr = 'app(\'lang\')->get(\'' . $param . '\')';
+                    $parseStr = 'app(\'lang\')->get(\''.$param.'\')';
                     break;
                 case 'CONFIG':
-                    $parseStr = 'app(\'config\')->get(\'' . $param . '\')';
+                    $parseStr = 'app(\'config\')->get(\''.$param.'\')';
                     break;
                 default:
                     $parseStr = '\'\'';
@@ -1155,10 +1155,10 @@ 
                     $parseStr = 'app()->version()';
                     break;
                 case 'LDELIM':
-                    $parseStr = '\'' . ltrim($this->config['tpl_begin'], '\\') . '\'';
+                    $parseStr = '\''.ltrim($this->config['tpl_begin'], '\\').'\'';
                     break;
                 case 'RDELIM':
-                    $parseStr = '\'' . ltrim($this->config['tpl_end'], '\\') . '\'';
+                    $parseStr = '\''.ltrim($this->config['tpl_end'], '\\').'\'';
                     break;
                 default:
                     if (defined($type)) {
@@ -1225,12 +1225,12 @@ 
 
             if ($this->config['view_base']) {
                 $module = isset($module) ? $module : $this->app['request']->module();
-                $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+                $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
             } else {
-                $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . basename($this->config['view_path']) . DIRECTORY_SEPARATOR : $this->config['view_path'];
+                $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.basename($this->config['view_path']).DIRECTORY_SEPARATOR : $this->config['view_path'];
             }
 
-            $template = $path . $template . '.' . ltrim($this->config['view_suffix'], '.');
+            $template = $path.$template.'.'.ltrim($this->config['view_suffix'], '.');
         }
 
         if (is_file($template)) {
@@ -1240,7 +1240,7 @@ 
             return $template;
         }
 
-        throw new TemplateNotFoundException('template not exists:' . $template, $template);
+        throw new TemplateNotFoundException('template not exists:'.$template, $template);
     }
 
     /**
@@ -1257,9 +1257,9 @@ 
             $end   = $this->config['tpl_end'];
 
             if (strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1) {
-                $regex = $begin . '((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>[^' . $end . ']*))' . $end;
+                $regex = $begin.'((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>[^'.$end.']*))'.$end;
             } else {
-                $regex = $begin . '((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>(?:(?!' . $end . ').)*))' . $end;
+                $regex = $begin.'((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>(?:(?!'.$end.').)*))'.$end;
             }
         } else {
             $begin  = $this->config['taglib_begin'];
@@ -1269,20 +1269,20 @@ 
             switch ($tagName) {
                 case 'block':
                     if ($single) {
-                        $regex = $begin . '(?:' . $tagName . '\b\s+(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>[^' . $end . ']*)|\/' . $tagName . ')' . $end;
+                        $regex = $begin.'(?:'.$tagName.'\b\s+(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>[^'.$end.']*)|\/'.$tagName.')'.$end;
                     } else {
-                        $regex = $begin . '(?:' . $tagName . '\b\s+(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>(?:(?!' . $end . ').)*)|\/' . $tagName . ')' . $end;
+                        $regex = $begin.'(?:'.$tagName.'\b\s+(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>(?:(?!'.$end.').)*)|\/'.$tagName.')'.$end;
                     }
                     break;
                 case 'literal':
                     if ($single) {
-                        $regex = '(' . $begin . $tagName . '\b(?>[^' . $end . ']*)' . $end . ')';
-                        $regex .= '(?:(?>[^' . $begin . ']*)(?>(?!' . $begin . '(?>' . $tagName . '\b[^' . $end . ']*|\/' . $tagName . ')' . $end . ')' . $begin . '[^' . $begin . ']*)*)';
-                        $regex .= '(' . $begin . '\/' . $tagName . $end . ')';
+                        $regex = '('.$begin.$tagName.'\b(?>[^'.$end.']*)'.$end.')';
+                        $regex .= '(?:(?>[^'.$begin.']*)(?>(?!'.$begin.'(?>'.$tagName.'\b[^'.$end.']*|\/'.$tagName.')'.$end.')'.$begin.'[^'.$begin.']*)*)';
+                        $regex .= '('.$begin.'\/'.$tagName.$end.')';
                     } else {
-                        $regex = '(' . $begin . $tagName . '\b(?>(?:(?!' . $end . ').)*)' . $end . ')';
-                        $regex .= '(?:(?>(?:(?!' . $begin . ').)*)(?>(?!' . $begin . '(?>' . $tagName . '\b(?>(?:(?!' . $end . ').)*)|\/' . $tagName . ')' . $end . ')' . $begin . '(?>(?:(?!' . $begin . ').)*))*)';
-                        $regex .= '(' . $begin . '\/' . $tagName . $end . ')';
+                        $regex = '('.$begin.$tagName.'\b(?>(?:(?!'.$end.').)*)'.$end.')';
+                        $regex .= '(?:(?>(?:(?!'.$begin.').)*)(?>(?!'.$begin.'(?>'.$tagName.'\b(?>(?:(?!'.$end.').)*)|\/'.$tagName.')'.$end.')'.$begin.'(?>(?:(?!'.$begin.').)*))*)';
+                        $regex .= '('.$begin.'\/'.$tagName.$end.')';
                     }
                     break;
                 case 'restoreliteral':
@@ -1297,15 +1297,15 @@ 
                         $name = 'name';
                     }
                     if ($single) {
-                        $regex = $begin . $tagName . '\b\s+(?>(?:(?!' . $name . '=).)*)\b' . $name . '=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>[^' . $end . ']*)' . $end;
+                        $regex = $begin.$tagName.'\b\s+(?>(?:(?!'.$name.'=).)*)\b'.$name.'=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>[^'.$end.']*)'.$end;
                     } else {
-                        $regex = $begin . $tagName . '\b\s+(?>(?:(?!' . $name . '=).)*)\b' . $name . '=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>(?:(?!' . $end . ').)*)' . $end;
+                        $regex = $begin.$tagName.'\b\s+(?>(?:(?!'.$name.'=).)*)\b'.$name.'=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>(?:(?!'.$end.').)*)'.$end;
                     }
                     break;
             }
         }
 
-        return '/' . $regex . '/is';
+        return '/'.$regex.'/is';
     }
 
     public function __debugInfo()

library/think/model/Collection.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function hidden($hidden = [], $override = false)
     {
-        $this->each(function ($model) use ($hidden, $override) {
+        $this->each(function($model) use ($hidden, $override) {
             /** @var Model $model */
             $model->hidden($hidden, $override);
         });
@@ -58,7 +58,7 @@ 
      */
     public function visible($visible = [], $override = false)
     {
-        $this->each(function ($model) use ($visible, $override) {
+        $this->each(function($model) use ($visible, $override) {
             /** @var Model $model */
             $model->visible($visible, $override);
         });
@@ -75,7 +75,7 @@ 
      */
     public function append($append = [], $override = false)
     {
-        $this->each(function ($model) use ($append, $override) {
+        $this->each(function($model) use ($append, $override) {
             /** @var Model $model */
             $model && $model->append($append, $override);
         });
@@ -92,7 +92,7 @@ 
      */
     public function withAttr($name, $callback = null)
     {
-        $this->each(function ($model) use ($name, $callback) {
+        $this->each(function($model) use ($name, $callback) {
             /** @var Model $model */
             $model && $model->withAttribute($name, $callback);
         });

library/think/model/Relation.php

Spacing +5 added lines, -5 removed lines

@@ -117,11 +117,11 @@ 
 
             foreach ($fields as &$field) {
                 if (false === strpos($field, '.')) {
-                    $field = $model . '.' . $field;
+                    $field = $model.'.'.$field;
                 }
             }
         } else {
-            $fields = $model . '.*';
+            $fields = $model.'.*';
         }
 
         return $fields;
@@ -131,10 +131,10 @@ 
     {
         foreach ($where as $key => &$val) {
             if (is_string($key)) {
-                $where[] = [false === strpos($key, '.') ? $relation . '.' . $key : $key, '=', $val];
+                $where[] = [false === strpos($key, '.') ? $relation.'.'.$key : $key, '=', $val];
                 unset($where[$key]);
             } elseif (isset($val[0]) && false === strpos($val[0], '.')) {
-                $val[0] = $relation . '.' . $val[0];
+                $val[0] = $relation.'.'.$val[0];
             }
         }
     }
@@ -181,7 +181,7 @@ 
 
             return $result === $this->query && !in_array(strtolower($method), ['fetchsql', 'fetchpdo']) ? $this : $result;
         } else {
-            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+            throw new Exception('method not exists:'.__CLASS__.'->'.$method);
         }
     }
 }

library/think/model/concern/Attribute.php

Spacing +6 added lines, -6 removed lines

@@ -271,7 +271,7 @@ 
         } elseif (array_key_exists($name, $this->relation)) {
             return $this->relation[$name];
         }
-        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+        throw new InvalidArgumentException('property not exists:'.static::class.'->'.$name);
     }
 
     /**
@@ -284,7 +284,7 @@ 
         if ($this->force) {
             $data = $this->data;
         } else {
-            $data = array_udiff_assoc($this->data, $this->origin, function ($a, $b) {
+            $data = array_udiff_assoc($this->data, $this->origin, function($a, $b) {
                 if ((empty($a) || empty($b)) && $a !== $b) {
                     return 1;
                 }
@@ -324,7 +324,7 @@ 
             $value = $this->autoWriteTimestamp($name);
         } else {
             // 检测修改器
-            $method = 'set' . Loader::parseName($name, 1) . 'Attr';
+            $method = 'set'.Loader::parseName($name, 1).'Attr';
 
             if (method_exists($this, $method)) {
                 $origin = $this->data;
@@ -481,7 +481,7 @@ 
 
         // 检测属性获取器
         $fieldName = Loader::parseName($name);
-        $method    = 'get' . Loader::parseName($name, 1) . 'Attr';
+        $method    = 'get'.Loader::parseName($name, 1).'Attr';
 
         if (isset($this->withAttr[$fieldName])) {
             if ($notFound && $relation = $this->isRelationAttr($name)) {
@@ -540,7 +540,7 @@ 
                         $key = is_numeric($key) ? $attr : $key;
 
                         if (isset($item[$key])) {
-                            throw new Exception('bind attr has exists:' . $key);
+                            throw new Exception('bind attr has exists:'.$key);
                         } else {
                             $item[$key] = $value ? $value->getAttr($attr) : null;
                         }
@@ -556,7 +556,7 @@ 
             }
         }
 
-        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+        throw new InvalidArgumentException('property not exists:'.static::class.'->'.$name);
     }
 
     /**

library/think/model/concern/Conversion.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
             foreach ($append as $key => $attr) {
                 $key = is_numeric($key) ? $attr : $key;
                 if (isset($this->data[$key])) {
-                    throw new Exception('bind attr has exists:' . $key);
+                    throw new Exception('bind attr has exists:'.$key);
                 } else {
                     $this->data[$key] = $model->$attr;
                 }