top-think / framework

library/think/Request.php

Spacing +29 added lines, -29 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;
@@ -729,10 +729,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);
             }
         }
 
@@ -1209,19 +1209,19 @@ 
             if ($file instanceof File) {
                 $array[$key] = $file;
             } elseif (is_array($file['name'])) {
-                $keys  = array_keys($file);
-                $array[$key]=[];
-                list($_name,$subName)=explode('.',$name);
-                $subFileNames=array_keys($file['name']);
+                $keys = array_keys($file);
+                $array[$key] = [];
+                list($_name, $subName) = explode('.', $name);
+                $subFileNames = array_keys($file['name']);
                 foreach ($subFileNames as $index => $subFileName) {
-                    $errorNo=$file['error'][$subFileName];
+                    $errorNo = $file['error'][$subFileName];
                     if ($errorNo > 0) {
-                        if($_name==$name){
+                        if ($_name == $name) {
                             //没有.符号时,忽略没上传的文件
-                            if($errorNo==4){
+                            if ($errorNo == 4) {
                                 continue;
                             }
-                        }else {
+                        } else {
                             //有.符号,但是二级名称不匹配时
                             if ($subName != $subFileName) {
                                 continue;
@@ -1519,7 +1519,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;
         }
@@ -2031,7 +2031,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);
@@ -2086,12 +2086,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 {

Braces +1 added lines, -1 removed lines

@@ -1221,7 +1221,7 @@
                             if($errorNo==4){
                                 continue;
                             }
-                        }else {
+                        } else {
                             //有.符号,但是二级名称不匹配时
                             if ($subName != $subFileName) {
                                 continue;