Rozbo / puck

core/helpers/Chaos.php

Spacing +20 added lines, -20 removed lines

@@ -122,18 +122,18 @@ 
 	 * @param string $str
 	 */
 	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
+		$py=mt_rand(0, iconv_strlen($str, 'UTF-8') - 1);
+		$t_str=iconv_substr($str, $py, 1, 'UTF-8');
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin=" ";
 		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
-        $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
+		$pinyin=$this->_pinyin->convert($t_str, PINYIN_UNICODE);
+        $pinyin=implode(" ", $pinyin);
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin.=" ";
 		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
+		if ($t_str != "%") {
+			$str=preg_replace("'$t_str'", $pinyin, $str, 1);
 		}
 		return $str;
 	}
@@ -144,18 +144,18 @@ 
 	 * @param string $str
 	 */
 	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
+		$len=iconv_strlen($str, 'UTF-8');
+		$action=0;
+		$temp='';
+		for ($i=0; $i < $len; $i++) {
+			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
+			if (mt_rand(1, 50) > 48 && $action == 0) {
+				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+					$temp.=$t_str;
+					$action=1;
 				}
 			}
-			$temp .= $t_str;
+			$temp.=$t_str;
 		}
 		return $temp;
 	}

function.php

Spacing +12 added lines, -12 removed lines

@@ -408,7 +408,7 @@ 
 
     // 过滤查询特殊字符
     if (preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
-        $value .= ' ';
+        $value.=' ';
     }
 }
 /**
@@ -416,15 +416,15 @@ 
  *
  * @return string|null
  */
-function config($name=null,$value=null,$default=null){
+function config($name=null, $value=null, $default=null) {
     $config=\puck\Conf::load();
-    if ($name===null){
+    if ($name === null) {
         return $config->all();
     }
-    if ($value===null){
-        return $config->get($name,$default);
+    if ($value === null) {
+        return $config->get($name, $default);
     }
-    $config->set($name,$value);
+    $config->set($name, $value);
 }
 /**
  * 字符串命名风格转换
@@ -441,14 +441,14 @@ 
     }
 }
 
-if (! function_exists('app')) {
+if (!function_exists('app')) {
     /**
      * 获取容器实例
      *
      * @param  string  $make
      * @return mixed|\puck\App
      */
-    function app($make = null)
+    function app($make=null)
     {
         if (is_null($make)) {
             return Container::getInstance();
@@ -457,7 +457,7 @@ 
     }
 }
 
-if (! function_exists('env')) {
+if (!function_exists('env')) {
     /**
      * 获取环境变量
      *
@@ -465,9 +465,9 @@ 
      * @param  mixed   $default
      * @return mixed
      */
-    function env($key, $default = null)
+    function env($key, $default=null)
     {
-        $value = getenv($key);
+        $value=getenv($key);
         if ($value === false) {
             return value($default);
         }
@@ -491,7 +491,7 @@ 
         return $value;
     }
 }
-if (! function_exists('value')) {
+if (!function_exists('value')) {
     /**
      * 返回给定的表达式的结果
      *

core/Config.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
      *
      * @var array
      */
-    protected $items = [];
+    protected $items=[];
 
     /**
      * Create a new configuration repository.
@@ -21,9 +21,9 @@ 
      * @param  array  $items
      * @return void
      */
-    public function __construct(array $items = [])
+    public function __construct(array $items=[])
     {
-        $this->items = $items;
+        $this->items=$items;
     }
 
     /**
@@ -44,7 +44,7 @@ 
      * @param  mixed   $default
      * @return mixed
      */
-    public function get($key, $default = null)
+    public function get($key, $default=null)
     {
         return Arr::get($this->items, $key, $default);
     }
@@ -56,9 +56,9 @@ 
      * @param  mixed   $value
      * @return void
      */
-    public function set($key, $value = null)
+    public function set($key, $value=null)
     {
-        $keys = is_array($key) ? $key : [$key => $value];
+        $keys=is_array($key) ? $key : [$key => $value];
 
         foreach ($keys as $key => $value) {
             Arr::set($this->items, $key, $value);
@@ -74,7 +74,7 @@ 
      */
     public function prepend($key, $value)
     {
-        $array = $this->get($key);
+        $array=$this->get($key);
 
         array_unshift($array, $value);
 
@@ -90,9 +90,9 @@ 
      */
     public function push($key, $value)
     {
-        $array = $this->get($key);
+        $array=$this->get($key);
 
-        $array[] = $value;
+        $array[]=$value;
 
         $this->set($key, $array);
     }

core/App.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @var array
      */
-    protected $loadedConfigurations = [];
+    protected $loadedConfigurations=[];
 
     /**
      * 应用的根目录.
@@ -32,16 +32,16 @@ 
         $this->initContainer();
         $this->initConfig();
     }
-    private function initConfig(){
+    private function initConfig() {
         $this->configure('core');
     }
 
-    private function initEnv(){
-        $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        $dotEnv=new Dotenv($this->basePath);
         $dotEnv->load();
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));
         define('IS_CLI', $this->runningInConsole());
-        define('IS_DEBUG',env('DEBUG',false));
+        define('IS_DEBUG', env('DEBUG', false));
         if (IS_DEBUG) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
@@ -63,11 +63,11 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->instance('config',new Config());
-        $this->instance('request',new Request($this->config));
-        $this->instance('route',new Route($this->request));
-        $this->bind('pinyin','\puck\helpers\PinYin');
+        $this->instance('app', $this);
+        $this->instance('config', new Config());
+        $this->instance('request', new Request($this->config));
+        $this->instance('route', new Route($this->request));
+        $this->bind('pinyin', '\puck\helpers\PinYin');
     }
 
     /**
@@ -76,16 +76,16 @@ 
      * @param  string|null  $path
      * @return string
      */
-    public function basePath($path = null)
+    public function basePath($path=null)
     {
         if (isset($this->basePath)) {
             return $this->basePath.($path ? '/'.$path : $path);
         }
 
         if ($this->runningInConsole()) {
-            $this->basePath = getcwd();
+            $this->basePath=getcwd();
         } else {
-            $this->basePath = realpath(getcwd().'/../');
+            $this->basePath=realpath(getcwd().'/../');
         }
 
         return $this->basePath($path);
@@ -111,8 +111,8 @@ 
             return;
         }
         //标记为已加载
-        $this->loadedConfigurations[$name] = true;
-        $path = $this->getConfigurationPath($name);
+        $this->loadedConfigurations[$name]=true;
+        $path=$this->getConfigurationPath($name);
         if ($path) {
             $this->make('config')->set($name, require $path);
         }
@@ -129,21 +129,21 @@ 
      * @param  string|null  $name
      * @return string
      */
-    public function getConfigurationPath($name = null)
+    public function getConfigurationPath($name=null)
     {
-        if (! $name) {
-            $appConfigDir = $this->basePath('configs').'/';
+        if (!$name) {
+            $appConfigDir=$this->basePath('configs').'/';
 
             if (file_exists($appConfigDir)) {
                 return $appConfigDir;
-            } elseif (file_exists($path = __DIR__.'/configs/')) {
+            } elseif (file_exists($path=__DIR__.'/configs/')) {
                 return $path;
             }
         } else {
-            $appConfigPath = $this->basePath('configs').'/'.$name.'.php';
+            $appConfigPath=$this->basePath('configs').'/'.$name.'.php';
             if (file_exists($appConfigPath)) {
                 return $appConfigPath;
-            } elseif (file_exists($path = __DIR__.'/configs/'.$name.'.php')) {
+            } elseif (file_exists($path=__DIR__.'/configs/'.$name.'.php')) {
                 return $path;
             }
         }

core/Route.php

Spacing +31 added lines, -31 removed lines

@@ -9,18 +9,18 @@ 
     private $request;
 
     public function __construct(Request $request) {
-        $this->request = $request;
-        $this->errorCallback=function (){
+        $this->request=$request;
+        $this->errorCallback=function() {
             die("404");
         };
     }
 
-    public static $halts = false;
-    private $routes = array();
-    private $regexRoutes = [];
-    public static $methods = array();
-    public static $callbacks = array();
-    private $patterns = array(
+    public static $halts=false;
+    private $routes=array();
+    private $regexRoutes=[];
+    public static $methods=array();
+    public static $callbacks=array();
+    private $patterns=array(
         ':any' => '[^/]+',
         ':num' => '[0-9]+',
         ':all' => '.*'
@@ -41,29 +41,29 @@ 
      * @param mixed $callBack
      */
     public function addRoute($method, $uri, $callBack) {
-        $method = strtoupper($method);
+        $method=strtoupper($method);
         //预定义正则路由
         if (strpos($uri, ':') !== false) {
-            $searches = array_keys($this->patterns);
-            $replaces = array_values($this->patterns);
-            $uri = str_replace($searches, $replaces, $uri);
-            $this->regexRoutes[] = [
+            $searches=array_keys($this->patterns);
+            $replaces=array_values($this->patterns);
+            $uri=str_replace($searches, $replaces, $uri);
+            $this->regexRoutes[]=[
                 'method' => $method,
-                'regex' => '#^' . $uri . '$#',
+                'regex' => '#^'.$uri.'$#',
                 'callback' => $callBack
             ];
         } //自定义正则路由
         elseif ($uri[0] == '#'
             || (strlen($uri) > 2 && tools\Str::endsWith($uri, '/') && tools\Str::startsWith($uri, '/'))
         ) {
-            $this->regexRoutes[] = [
+            $this->regexRoutes[]=[
                 'method' => $method,
                 'regex' => $uri,
                 'callback' => $callBack
             ];
         } //直接定义的路由
         else {
-            $this->routes[$method . $uri] = [
+            $this->routes[$method.$uri]=[
                 'method' => $method,
                 'uri' => $uri,
                 'callback' => $callBack
@@ -75,25 +75,25 @@ 
      * Defines callback if route is not found
      */
     public function error($callback) {
-        $this->errorCallback = $callback;
+        $this->errorCallback=$callback;
     }
 
-    public static function haltOnMatch($flag = true) {
-        self::$halts = $flag;
+    public static function haltOnMatch($flag=true) {
+        self::$halts=$flag;
     }
 
 
-    private function foundRoute($route, $param = []) {
+    private function foundRoute($route, $param=[]) {
         try {
             if ($route['callback'] instanceof \Closure) {
-                app()->invokeFunction($route['callback'],$param);
+                app()->invokeFunction($route['callback'], $param);
             } else {
                 // Grab all parts based on a / separator
-                $parts = explode('/', $route['callback']);
+                $parts=explode('/', $route['callback']);
                 // Collect the last index of the array
-                $last = end($parts);
+                $last=end($parts);
                 // Grab the controller name and method call
-                $segments = explode('@', $last);
+                $segments=explode('@', $last);
                 app()->invokeMethod($segments, $param);
             }
         } catch (\ReflectionException $e) {
@@ -125,20 +125,20 @@ 
      */
     public function dispatch() {
 
-        $current['uri'] = $this->request->path();
-        $current['method'] = $this->request->method();
+        $current['uri']=$this->request->path();
+        $current['method']=$this->request->method();
         # 第一种情况，直接命中
-        if (isset($this->routes[$current['method'] . $current['uri']])) {
-            $this->foundRoute($this->routes[$current['method'] . $current['uri']]);
+        if (isset($this->routes[$current['method'].$current['uri']])) {
+            $this->foundRoute($this->routes[$current['method'].$current['uri']]);
         } # 第二种情况，any命中
-        else if (isset($this->routes['ANY' . $current['uri']])) {
-            $this->foundRoute($this->routes['ANY' . $current['method']]);
+        else if (isset($this->routes['ANY'.$current['uri']])) {
+            $this->foundRoute($this->routes['ANY'.$current['method']]);
         } # 第三种情况，正则命中
         else {
             if ($this->foundRegexRoute($current)) {
 
             } else {
-                $route['callback'] = $this->errorCallback;
+                $route['callback']=$this->errorCallback;
                 $this->foundRoute($route);
             }
         }

core/tools/Arr.php

Spacing +45 added lines, -45 removed lines

@@ -42,16 +42,16 @@ 
      * @return array
      */
     public static function collapse($array) {
-        $results = [];
+        $results=[];
 
         foreach ($array as $values) {
             if ($values instanceof Collection) {
-                $values = $values->all();
+                $values=$values->all();
             } elseif (!is_array($values)) {
                 continue;
             }
 
-            $results = array_merge($results, $values);
+            $results=array_merge($results, $values);
         }
 
         return $results;
@@ -74,14 +74,14 @@ 
      * @param  string $prepend
      * @return array
      */
-    public static function dot($array, $prepend = '') {
-        $results = [];
+    public static function dot($array, $prepend='') {
+        $results=[];
 
         foreach ($array as $key => $value) {
             if (is_array($value) && !empty($value)) {
-                $results = array_merge($results, static::dot($value, $prepend . $key . '.'));
+                $results=array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
-                $results[$prepend . $key] = $value;
+                $results[$prepend.$key]=$value;
             }
         }
 
@@ -124,7 +124,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function first($array, callable $callback = null, $default = null) {
+    public static function first($array, callable $callback=null, $default=null) {
         if (is_null($callback)) {
             if (empty($array)) {
                 return value($default);
@@ -152,7 +152,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function last($array, callable $callback = null, $default = null) {
+    public static function last($array, callable $callback=null, $default=null) {
         if (is_null($callback)) {
             return empty($array) ? value($default) : end($array);
         }
@@ -167,9 +167,9 @@ 
      * @param  int $depth
      * @return array
      */
-    public static function flatten($array, $depth = INF) {
-        return array_reduce($array, function ($result, $item) use ($depth) {
-            $item = $item instanceof Collection ? $item->all() : $item;
+    public static function flatten($array, $depth=INF) {
+        return array_reduce($array, function($result, $item) use ($depth) {
+            $item=$item instanceof Collection ? $item->all() : $item;
 
             if (!is_array($item)) {
                 return array_merge($result, [$item]);
@@ -189,9 +189,9 @@ 
      * @return void
      */
     public static function forget(&$array, $keys) {
-        $original = &$array;
+        $original=&$array;
 
-        $keys = (array)$keys;
+        $keys=(array) $keys;
 
         if (count($keys) === 0) {
             return;
@@ -205,16 +205,16 @@ 
                 continue;
             }
 
-            $parts = explode('.', $key);
+            $parts=explode('.', $key);
 
             // clean up before each pass
-            $array = &$original;
+            $array=&$original;
 
             while (count($parts) > 1) {
-                $part = array_shift($parts);
+                $part=array_shift($parts);
 
                 if (isset($array[$part]) && is_array($array[$part])) {
-                    $array = &$array[$part];
+                    $array=&$array[$part];
                 } else {
                     continue 2;
                 }
@@ -232,7 +232,7 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function get($array, $key, $default = null) {
+    public static function get($array, $key, $default=null) {
         if (!static::accessible($array)) {
             return value($default);
         }
@@ -247,7 +247,7 @@ 
 
         foreach (explode('.', $key) as $segment) {
             if (static::accessible($array) && static::exists($array, $segment)) {
-                $array = $array[$segment];
+                $array=$array[$segment];
             } else {
                 return value($default);
             }
@@ -268,7 +268,7 @@ 
             return false;
         }
 
-        $keys = (array)$keys;
+        $keys=(array) $keys;
 
         if (!$array) {
             return false;
@@ -279,7 +279,7 @@ 
         }
 
         foreach ($keys as $key) {
-            $subKeyArray = $array;
+            $subKeyArray=$array;
 
             if (static::exists($array, $key)) {
                 continue;
@@ -287,7 +287,7 @@ 
 
             foreach (explode('.', $key) as $segment) {
                 if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
-                    $subKeyArray = $subKeyArray[$segment];
+                    $subKeyArray=$subKeyArray[$segment];
                 } else {
                     return false;
                 }
@@ -306,7 +306,7 @@ 
      * @return bool
      */
     public static function isAssoc(array $array) {
-        $keys = array_keys($array);
+        $keys=array_keys($array);
 
         return array_keys($keys) !== $keys;
     }
@@ -319,7 +319,7 @@ 
      * @return array
      */
     public static function only($array, $keys) {
-        return array_intersect_key($array, array_flip((array)$keys));
+        return array_intersect_key($array, array_flip((array) $keys));
     }
 
     /**
@@ -330,23 +330,23 @@ 
      * @param  string|array|null $key
      * @return array
      */
-    public static function pluck($array, $value, $key = null) {
-        $results = [];
+    public static function pluck($array, $value, $key=null) {
+        $results=[];
 
-        list($value, $key) = static::explodePluckParameters($value, $key);
+        list($value, $key)=static::explodePluckParameters($value, $key);
 
         foreach ($array as $item) {
-            $itemValue = data_get($item, $value);
+            $itemValue=data_get($item, $value);
 
             // If the key is "null", we will just append the value to the array and keep
             // looping. Otherwise we will key the array using the value of the key we
             // received from the developer. Then we'll return the final array form.
             if (is_null($key)) {
-                $results[] = $itemValue;
+                $results[]=$itemValue;
             } else {
-                $itemKey = data_get($item, $key);
+                $itemKey=data_get($item, $key);
 
-                $results[$itemKey] = $itemValue;
+                $results[$itemKey]=$itemValue;
             }
         }
 
@@ -361,9 +361,9 @@ 
      * @return array
      */
     protected static function explodePluckParameters($value, $key) {
-        $value = is_string($value) ? explode('.', $value) : $value;
+        $value=is_string($value) ? explode('.', $value) : $value;
 
-        $key = is_null($key) || is_array($key) ? $key : explode('.', $key);
+        $key=is_null($key) || is_array($key) ? $key : explode('.', $key);
 
         return [$value, $key];
     }
@@ -376,11 +376,11 @@ 
      * @param  mixed $key
      * @return array
      */
-    public static function prepend($array, $value, $key = null) {
+    public static function prepend($array, $value, $key=null) {
         if (is_null($key)) {
             array_unshift($array, $value);
         } else {
-            $array = [$key => $value] + $array;
+            $array=[$key => $value] + $array;
         }
 
         return $array;
@@ -394,8 +394,8 @@ 
      * @param  mixed $default
      * @return mixed
      */
-    public static function pull(&$array, $key, $default = null) {
-        $value = static::get($array, $key, $default);
+    public static function pull(&$array, $key, $default=null) {
+        $value=static::get($array, $key, $default);
 
         static::forget($array, $key);
 
@@ -414,25 +414,25 @@ 
      */
     public static function set(&$array, $key, $value) {
         if (is_null($key)) {
-            return $array = $value;
+            return $array=$value;
         }
 
-        $keys = explode('.', $key);
+        $keys=explode('.', $key);
 
         while (count($keys) > 1) {
-            $key = array_shift($keys);
+            $key=array_shift($keys);
 
             // If the key doesn't exist at this depth, we will just create an empty array
             // to hold the next value, allowing us to create the arrays to hold final
             // values at the correct depth. Then we'll keep digging into the array.
             if (!isset($array[$key]) || !is_array($array[$key])) {
-                $array[$key] = [];
+                $array[$key]=[];
             }
 
-            $array = &$array[$key];
+            $array=&$array[$key];
         }
 
-        $array[array_shift($keys)] = $value;
+        $array[array_shift($keys)]=$value;
 
         return $array;
     }
@@ -469,7 +469,7 @@ 
     public static function sortRecursive($array) {
         foreach ($array as &$value) {
             if (is_array($value)) {
-                $value = static::sortRecursive($value);
+                $value=static::sortRecursive($value);
             }
         }
 

core/Request.php

Spacing +279 added lines, -279 removed lines

@@ -51,12 +51,12 @@ 
     /**
      * @var array 当前路由信息
      */
-    protected $routeInfo = [];
+    protected $routeInfo=[];
 
     /**
      * @var array 当前调度信息
      */
-    protected $dispatch = [];
+    protected $dispatch=[];
     protected $module;
     protected $controller;
     protected $action;
@@ -66,22 +66,22 @@ 
     /**
      * @var array 请求参数
      */
-    protected $param   = [];
-    protected $get     = [];
-    protected $post    = [];
-    protected $request = [];
-    protected $route   = [];
+    protected $param=[];
+    protected $get=[];
+    protected $post=[];
+    protected $request=[];
+    protected $route=[];
     protected $put;
-    protected $session = [];
-    protected $file    = [];
-    protected $cookie  = [];
-    protected $server  = [];
-    protected $header  = [];
+    protected $session=[];
+    protected $file=[];
+    protected $cookie=[];
+    protected $server=[];
+    protected $header=[];
 
     /**
      * @var array 资源类型
      */
-    protected $mimeType = [
+    protected $mimeType=[
         'xml'  => 'application/xml,text/xml,application/x-xml',
         'json' => 'application/json,text/x-json,application/jsonrequest,text/json',
         'js'   => 'text/javascript,application/javascript,application/x-javascript',
@@ -103,9 +103,9 @@ 
     // 全局过滤规则
     protected $filter;
     // Hook扩展方法
-    protected static $hook = [];
+    protected static $hook=[];
     // 绑定的属性
-    protected $bind = [];
+    protected $bind=[];
     // php://input
     protected $input;
     // 请求缓存
@@ -118,20 +118,20 @@ 
      * @access public
      * @param array $options 参数
      */
-    public function __construct(Config $config, $options = [])
+    public function __construct(Config $config, $options=[])
     {
         $this->server();
         foreach ($options as $name => $item) {
             if (property_exists($this, $name)) {
-                $this->$name = $item;
+                $this->$name=$item;
             }
         }
-        $this->config = $config;
+        $this->config=$config;
         if (is_null($this->filter)) {
-            $this->filter = $this->config->get('default_filter');
+            $this->filter=$this->config->get('default_filter');
         }
         // 保存 php://input
-        $this->input = file_get_contents('php://input');
+        $this->input=file_get_contents('php://input');
     }
 
     public function __call($method, $args)
@@ -140,7 +140,7 @@ 
             array_unshift($args, $this);
             return call_user_func_array($this->hook[$method], $args);
         } else {
-            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+            throw new Exception('method not exists:'.__CLASS__.'->'.$method);
         }
     }
 
@@ -151,12 +151,12 @@ 
      * @param mixed         $callback callable
      * @return void
      */
-    public function hook($method, $callback = null)
+    public function hook($method, $callback=null)
     {
         if (is_array($method)) {
-            $this->hook = array_merge($this->hook, $method);
+            $this->hook=array_merge($this->hook, $method);
         } else {
-            $this->hook[$method] = $callback;
+            $this->hook[$method]=$callback;
         }
     }
 
@@ -172,72 +172,72 @@ 
      * @param string    $content
      * @return \think\Request
      */
-    public function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null)
+    public function create($uri, $method='GET', $params=[], $cookie=[], $files=[], $server=[], $content=null)
     {
-        $server['PATH_INFO']      = '';
-        $server['REQUEST_METHOD'] = strtoupper($method);
-        $info                     = parse_url($uri);
+        $server['PATH_INFO']='';
+        $server['REQUEST_METHOD']=strtoupper($method);
+        $info=parse_url($uri);
         if (isset($info['host'])) {
-            $server['SERVER_NAME'] = $info['host'];
-            $server['HTTP_HOST']   = $info['host'];
+            $server['SERVER_NAME']=$info['host'];
+            $server['HTTP_HOST']=$info['host'];
         }
         if (isset($info['scheme'])) {
             if ('https' === $info['scheme']) {
-                $server['HTTPS']       = 'on';
-                $server['SERVER_PORT'] = 443;
+                $server['HTTPS']='on';
+                $server['SERVER_PORT']=443;
             } else {
                 unset($server['HTTPS']);
-                $server['SERVER_PORT'] = 80;
+                $server['SERVER_PORT']=80;
             }
         }
         if (isset($info['port'])) {
-            $server['SERVER_PORT'] = $info['port'];
-            $server['HTTP_HOST']   = $server['HTTP_HOST'] . ':' . $info['port'];
+            $server['SERVER_PORT']=$info['port'];
+            $server['HTTP_HOST']=$server['HTTP_HOST'].':'.$info['port'];
         }
         if (isset($info['user'])) {
-            $server['PHP_AUTH_USER'] = $info['user'];
+            $server['PHP_AUTH_USER']=$info['user'];
         }
         if (isset($info['pass'])) {
-            $server['PHP_AUTH_PW'] = $info['pass'];
+            $server['PHP_AUTH_PW']=$info['pass'];
         }
         if (!isset($info['path'])) {
-            $info['path'] = '/';
+            $info['path']='/';
         }
-        $options                      = [];
-        $options[strtolower($method)] = $params;
-        $queryString                  = '';
+        $options=[];
+        $options[strtolower($method)]=$params;
+        $queryString='';
         if (isset($info['query'])) {
             parse_str(html_entity_decode($info['query']), $query);
             if (!empty($params)) {
-                $params      = array_replace($query, $params);
-                $queryString = http_build_query($query, '', '&');
+                $params=array_replace($query, $params);
+                $queryString=http_build_query($query, '', '&');
             } else {
-                $params      = $query;
-                $queryString = $info['query'];
+                $params=$query;
+                $queryString=$info['query'];
             }
         } elseif (!empty($params)) {
-            $queryString = http_build_query($params, '', '&');
+            $queryString=http_build_query($params, '', '&');
         }
         if ($queryString) {
             parse_str($queryString, $get);
-            $options['get'] = isset($options['get']) ? array_merge($get, $options['get']) : $get;
-        }
-
-        $server['REQUEST_URI']  = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
-        $server['QUERY_STRING'] = $queryString;
-        $options['cookie']      = $cookie;
-        $options['param']       = $params;
-        $options['file']        = $files;
-        $options['server']      = $server;
-        $options['url']         = $server['REQUEST_URI'];
-        $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['content']     = $content;
+            $options['get']=isset($options['get']) ? array_merge($get, $options['get']) : $get;
+        }
+
+        $server['REQUEST_URI']=$info['path'].('' !== $queryString ? '?'.$queryString : '');
+        $server['QUERY_STRING']=$queryString;
+        $options['cookie']=$cookie;
+        $options['param']=$params;
+        $options['file']=$files;
+        $options['server']=$server;
+        $options['url']=$server['REQUEST_URI'];
+        $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['content']=$content;
         foreach ($options as $name => $item) {
             if (property_exists($this, $name)) {
-                $this->$name = $item;
+                $this->$name=$item;
             }
         }
         return $this;
@@ -249,13 +249,13 @@ 
      * @param string $domain 域名
      * @return string
      */
-    public function domain($domain = null)
+    public function domain($domain=null)
     {
         if (!is_null($domain)) {
-            $this->domain = $domain;
+            $this->domain=$domain;
             return $this;
         } elseif (!$this->domain) {
-            $this->domain = $this->scheme() . '://' . $this->host();
+            $this->domain=$this->scheme().'://'.$this->host();
         }
         return $this->domain;
     }
@@ -266,25 +266,25 @@ 
      * @param string|true $url URL地址 true 带域名获取
      * @return string
      */
-    public function url($url = null)
+    public function url($url=null)
     {
         if (!is_null($url) && true !== $url) {
-            $this->url = $url;
+            $this->url=$url;
             return $this;
         } elseif (!$this->url) {
             if ($this->isCli()) {
-                $this->url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
+                $this->url=isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
             } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-                $this->url = $_SERVER['HTTP_X_REWRITE_URL'];
+                $this->url=$_SERVER['HTTP_X_REWRITE_URL'];
             } elseif (isset($_SERVER['REQUEST_URI'])) {
-                $this->url = $_SERVER['REQUEST_URI'];
+                $this->url=$_SERVER['REQUEST_URI'];
             } elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
-                $this->url = $_SERVER['ORIG_PATH_INFO'] . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
+                $this->url=$_SERVER['ORIG_PATH_INFO'].(!empty($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING'] : '');
             } else {
-                $this->url = '';
+                $this->url='';
             }
         }
-        return true === $url ? $this->domain() . $this->url : $this->url;
+        return true === $url ? $this->domain().$this->url : $this->url;
     }
 
     /**
@@ -293,16 +293,16 @@ 
      * @param string $url URL地址
      * @return string
      */
-    public function baseUrl($url = null)
+    public function baseUrl($url=null)
     {
         if (!is_null($url) && true !== $url) {
-            $this->baseUrl = $url;
+            $this->baseUrl=$url;
             return $this;
         } elseif (!$this->baseUrl) {
-            $str           = $this->url();
-            $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
+            $str=$this->url();
+            $this->baseUrl=strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
-        return true === $url ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return true === $url ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -311,30 +311,30 @@ 
      * @param string $file 当前执行的文件
      * @return string
      */
-    public function baseFile($file = null)
+    public function baseFile($file=null)
     {
         if (!is_null($file) && true !== $file) {
-            $this->baseFile = $file;
+            $this->baseFile=$file;
             return $this;
         } elseif (!$this->baseFile) {
-            $url = '';
+            $url='';
             if (!$this->isCli()) {
-                $script_name = basename($_SERVER['SCRIPT_FILENAME']);
+                $script_name=basename($_SERVER['SCRIPT_FILENAME']);
                 if (basename($_SERVER['SCRIPT_NAME']) === $script_name) {
-                    $url = $_SERVER['SCRIPT_NAME'];
+                    $url=$_SERVER['SCRIPT_NAME'];
                 } elseif (basename($_SERVER['PHP_SELF']) === $script_name) {
-                    $url = $_SERVER['PHP_SELF'];
+                    $url=$_SERVER['PHP_SELF'];
                 } elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $script_name) {
-                    $url = $_SERVER['ORIG_SCRIPT_NAME'];
-                } elseif (($pos = strpos($_SERVER['PHP_SELF'], '/' . $script_name)) !== false) {
-                    $url = substr($_SERVER['SCRIPT_NAME'], 0, $pos) . '/' . $script_name;
+                    $url=$_SERVER['ORIG_SCRIPT_NAME'];
+                } elseif (($pos=strpos($_SERVER['PHP_SELF'], '/'.$script_name)) !== false) {
+                    $url=substr($_SERVER['SCRIPT_NAME'], 0, $pos).'/'.$script_name;
                 } elseif (isset($_SERVER['DOCUMENT_ROOT']) && strpos($_SERVER['SCRIPT_FILENAME'], $_SERVER['DOCUMENT_ROOT']) === 0) {
-                    $url = str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME']));
+                    $url=str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME']));
                 }
             }
-            $this->baseFile = $url;
+            $this->baseFile=$url;
         }
-        return true === $file ? $this->domain() . $this->baseFile : $this->baseFile;
+        return true === $file ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -343,19 +343,19 @@ 
      * @param string $url URL地址
      * @return string
      */
-    public function root($url = null)
+    public function root($url=null)
     {
         if (!is_null($url) && true !== $url) {
-            $this->root = $url;
+            $this->root=$url;
             return $this;
         } elseif (!$this->root) {
-            $file = $this->baseFile();
+            $file=$this->baseFile();
             if ($file && 0 !== strpos($this->url(), $file)) {
-                $file = str_replace('\\', '/', dirname($file));
+                $file=str_replace('\\', '/', dirname($file));
             }
-            $this->root = rtrim($file, '/');
+            $this->root=rtrim($file, '/');
         }
-        return true === $url ? $this->domain() . $this->root : $this->root;
+        return true === $url ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -365,10 +365,10 @@ 
      */
     public function rootUrl()
     {
-        $base = $this->root();
-        $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
+        $base=$this->root();
+        $root=strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root='/'.ltrim($root, '/');
         }
         return $root;
     }
@@ -382,17 +382,17 @@ 
     public function path()
     {
         if (is_null($this->path)) {
-            $suffix   = $this->config->get('core.url_html_suffix');
-            $pathinfo = $this->baseUrl();
+            $suffix=$this->config->get('core.url_html_suffix');
+            $pathinfo=$this->baseUrl();
             if (false === $suffix) {
                 // 禁止伪静态访问
-                $this->path = $pathinfo;
+                $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);
             }
         }
         return $this->path;
@@ -414,7 +414,7 @@ 
      * @param bool $float 是否使用浮点类型
      * @return integer|float
      */
-    public function time($float = false)
+    public function time($float=false)
     {
         return $float ? $_SERVER['REQUEST_TIME_FLOAT'] : $_SERVER['REQUEST_TIME'];
     }
@@ -426,13 +426,13 @@ 
      */
     public function type()
     {
-        $accept = $this->server('HTTP_ACCEPT');
+        $accept=$this->server('HTTP_ACCEPT');
         if (empty($accept)) {
             return false;
         }
 
         foreach ($this->mimeType as $key => $val) {
-            $array = explode(',', $val);
+            $array=explode(',', $val);
             foreach ($array as $k => $v) {
                 if (stristr($accept, $v)) {
                     return $key;
@@ -449,12 +449,12 @@ 
      * @param string        $val 资源类型
      * @return void
      */
-    public function mimeType($type, $val = '')
+    public function mimeType($type, $val='')
     {
         if (is_array($type)) {
-            $this->mimeType = array_merge($this->mimeType, $type);
+            $this->mimeType=array_merge($this->mimeType, $type);
         } else {
-            $this->mimeType[$type] = $val;
+            $this->mimeType[$type]=$val;
         }
     }
 
@@ -464,19 +464,19 @@ 
      * @param bool $method  true 获取原始请求类型
      * @return string
      */
-    public function method($method = false)
+    public function method($method=false)
     {
         if (true === $method) {
             // 获取原始请求类型
             return $this->isCli() ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']);
         } elseif (!$this->method) {
             if (isset($_POST[$this->config->get('var_method')])) {
-                $this->method = strtoupper($_POST[$this->config->get('var_method')]);
+                $this->method=strtoupper($_POST[$this->config->get('var_method')]);
                 $this->{$this->method}($_POST);
             } elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-                $this->method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
+                $this->method=strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
             } else {
-                $this->method = $this->isCli() ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']);
+                $this->method=$this->isCli() ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']);
             }
         }
         return $this->method;
@@ -580,30 +580,30 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function param($name = '', $default = null, $filter = '')
+    public function param($name='', $default=null, $filter='')
     {
         if (empty($this->param)) {
-            $method = $this->method(true);
+            $method=$this->method(true);
             // 自动获取请求变量
             switch ($method) {
                 case 'POST':
-                    $vars = $this->post(false);
+                    $vars=$this->post(false);
                     break;
                 case 'PUT':
                 case 'DELETE':
                 case 'PATCH':
-                    $vars = $this->put(false);
+                    $vars=$this->put(false);
                     break;
                 default:
-                    $vars = [];
+                    $vars=[];
             }
             // 当前请求参数和URL地址中的参数合并
-            $this->param = array_merge($this->get(false), $vars, $this->route(false));
+            $this->param=array_merge($this->get(false), $vars, $this->route(false));
         }
         if (true === $name) {
             // 获取包含文件上传信息的数组
-            $file = $this->file();
-            $data = is_array($file) ? array_merge($this->param, $file) : $this->param;
+            $file=$this->file();
+            $data=is_array($file) ? array_merge($this->param, $file) : $this->param;
             return $this->input($data, '', $default, $filter);
         }
         return $this->input($this->param, $name, $default, $filter);
@@ -617,11 +617,11 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function route($name = '', $default = null, $filter = '')
+    public function route($name='', $default=null, $filter='')
     {
         if (is_array($name)) {
-            $this->param        = [];
-            return $this->route = array_merge($this->route, $name);
+            $this->param=[];
+            return $this->route=array_merge($this->route, $name);
         }
         return $this->input($this->route, $name, $default, $filter);
     }
@@ -634,14 +634,14 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function get($name = '', $default = null, $filter = '')
+    public function get($name='', $default=null, $filter='')
     {
         if (empty($this->get)) {
-            $this->get = $_GET;
+            $this->get=$_GET;
         }
         if (is_array($name)) {
-            $this->param      = [];
-            return $this->get = array_merge($this->get, $name);
+            $this->param=[];
+            return $this->get=array_merge($this->get, $name);
         }
         return $this->input($this->get, $name, $default, $filter);
     }
@@ -654,19 +654,19 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function post($name = '', $default = null, $filter = '')
+    public function post($name='', $default=null, $filter='')
     {
         if (empty($this->post)) {
-            $content = $this->input;
+            $content=$this->input;
             if (empty($_POST) && false !== strpos($this->contentType(), 'application/json')) {
-                $this->post = (array) json_decode($content, true);
+                $this->post=(array) json_decode($content, true);
             } else {
-                $this->post = $_POST;
+                $this->post=$_POST;
             }
         }
         if (is_array($name)) {
-            $this->param       = [];
-            return $this->post = array_merge($this->post, $name);
+            $this->param=[];
+            return $this->post=array_merge($this->post, $name);
         }
         return $this->input($this->post, $name, $default, $filter);
     }
@@ -679,19 +679,19 @@ 
      * @param string|array      $filter 过滤方法
      * @return mixed
      */
-    public function put($name = '', $default = null, $filter = '')
+    public function put($name='', $default=null, $filter='')
     {
         if (is_null($this->put)) {
-            $content = $this->input;
+            $content=$this->input;
             if (false !== strpos($this->contentType(), 'application/json')) {
-                $this->put = (array) json_decode($content, true);
+                $this->put=(array) json_decode($content, true);
             } else {
                 parse_str($content, $this->put);
             }
         }
         if (is_array($name)) {
-            $this->param      = [];
-            return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
+            $this->param=[];
+            return $this->put=is_null($this->put) ? $name : array_merge($this->put, $name);
         }
 
         return $this->input($this->put, $name, $default, $filter);
@@ -705,7 +705,7 @@ 
      * @param string|array      $filter 过滤方法
      * @return mixed
      */
-    public function delete($name = '', $default = null, $filter = '')
+    public function delete($name='', $default=null, $filter='')
     {
         return $this->put($name, $default, $filter);
     }
@@ -718,7 +718,7 @@ 
      * @param string|array      $filter 过滤方法
      * @return mixed
      */
-    public function patch($name = '', $default = null, $filter = '')
+    public function patch($name='', $default=null, $filter='')
     {
         return $this->put($name, $default, $filter);
     }
@@ -730,14 +730,14 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function request($name = '', $default = null, $filter = '')
+    public function request($name='', $default=null, $filter='')
     {
         if (empty($this->request)) {
-            $this->request = $_REQUEST;
+            $this->request=$_REQUEST;
         }
         if (is_array($name)) {
-            $this->param          = [];
-            return $this->request = array_merge($this->request, $name);
+            $this->param=[];
+            return $this->request=array_merge($this->request, $name);
         }
         return $this->input($this->request, $name, $default, $filter);
     }
@@ -750,13 +750,13 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function session($name = '', $default = null, $filter = '')
+    public function session($name='', $default=null, $filter='')
     {
         if (empty($this->session)) {
-            $this->session = Session::get();
+            $this->session=Session::get();
         }
         if (is_array($name)) {
-            return $this->session = array_merge($this->session, $name);
+            return $this->session=array_merge($this->session, $name);
         }
         return $this->input($this->session, $name, $default, $filter);
     }
@@ -769,13 +769,13 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function cookie($name = '', $default = null, $filter = '')
+    public function cookie($name='', $default=null, $filter='')
     {
         if (empty($this->cookie)) {
-            $this->cookie = $_COOKIE;
+            $this->cookie=$_COOKIE;
         }
         if (is_array($name)) {
-            return $this->cookie = array_merge($this->cookie, $name);
+            return $this->cookie=array_merge($this->cookie, $name);
         }
         return $this->input($this->cookie, $name, $default, $filter);
     }
@@ -788,13 +788,13 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function server($name = '', $default = null, $filter = '')
+    public function server($name='', $default=null, $filter='')
     {
         if (empty($this->server)) {
-            $this->server = $_SERVER;
+            $this->server=$_SERVER;
         }
         if (is_array($name)) {
-            return $this->server = array_merge($this->server, $name);
+            return $this->server=array_merge($this->server, $name);
         }
         return $this->input($this->server, false === $name ? false : strtoupper($name), $default, $filter);
     }
@@ -805,47 +805,47 @@ 
      * @param string|array $name 名称
      * @return null|array|\think\File
      */
-    public function file($name = '')
+    public function file($name='')
     {
         if (empty($this->file)) {
-            $this->file = isset($_FILES) ? $_FILES : [];
+            $this->file=isset($_FILES) ? $_FILES : [];
         }
         if (is_array($name)) {
-            return $this->file = array_merge($this->file, $name);
+            return $this->file=array_merge($this->file, $name);
         }
-        $files = $this->file;
+        $files=$this->file;
         if (!empty($files)) {
             // 处理上传文件
-            $array = [];
+            $array=[];
             foreach ($files as $key => $file) {
                 if (is_array($file['name'])) {
-                    $item  = [];
-                    $keys  = array_keys($file);
-                    $count = count($file['name']);
-                    for ($i = 0; $i < $count; $i++) {
+                    $item=[];
+                    $keys=array_keys($file);
+                    $count=count($file['name']);
+                    for ($i=0; $i < $count; $i++) {
                         if (empty($file['tmp_name'][$i]) || !is_file($file['tmp_name'][$i])) {
                             continue;
                         }
-                        $temp['key'] = $key;
+                        $temp['key']=$key;
                         foreach ($keys as $_key) {
-                            $temp[$_key] = $file[$_key][$i];
+                            $temp[$_key]=$file[$_key][$i];
                         }
-                        $item[] = (new File($temp['tmp_name']))->setUploadInfo($temp);
+                        $item[]=(new File($temp['tmp_name']))->setUploadInfo($temp);
                     }
-                    $array[$key] = $item;
+                    $array[$key]=$item;
                 } else {
                     if ($file instanceof File) {
-                        $array[$key] = $file;
+                        $array[$key]=$file;
                     } else {
                         if (empty($file['tmp_name']) || !is_file($file['tmp_name'])) {
                             continue;
                         }
-                        $array[$key] = (new File($file['tmp_name']))->setUploadInfo($file);
+                        $array[$key]=(new File($file['tmp_name']))->setUploadInfo($file);
                     }
                 }
             }
             if (strpos($name, '.')) {
-                list($name, $sub) = explode('.', $name);
+                list($name, $sub)=explode('.', $name);
             }
             if ('' === $name) {
                 // 获取全部文件
@@ -866,13 +866,13 @@ 
      * @param string|array  $filter 过滤方法
      * @return mixed
      */
-    public function env($name = '', $default = null, $filter = '')
+    public function env($name='', $default=null, $filter='')
     {
         if (empty($this->env)) {
-            $this->env = $_ENV;
+            $this->env=$_ENV;
         }
         if (is_array($name)) {
-            return $this->env = array_merge($this->env, $name);
+            return $this->env=array_merge($this->env, $name);
         }
         return $this->input($this->env, false === $name ? false : strtoupper($name), $default, $filter);
     }
@@ -884,36 +884,36 @@ 
      * @param string        $default 默认值
      * @return string
      */
-    public function header($name = '', $default = null)
+    public function header($name='', $default=null)
     {
         if (empty($this->header)) {
-            $header = [];
-            if (function_exists('apache_request_headers') && $result = apache_request_headers()) {
-                $header = $result;
+            $header=[];
+            if (function_exists('apache_request_headers') && $result=apache_request_headers()) {
+                $header=$result;
             } else {
-                $server = $this->server ?: $_SERVER;
+                $server=$this->server ?: $_SERVER;
                 foreach ($server as $key => $val) {
                     if (0 === strpos($key, 'HTTP_')) {
-                        $key          = str_replace('_', '-', strtolower(substr($key, 5)));
-                        $header[$key] = $val;
+                        $key=str_replace('_', '-', strtolower(substr($key, 5)));
+                        $header[$key]=$val;
                     }
                 }
                 if (isset($server['CONTENT_TYPE'])) {
-                    $header['content-type'] = $server['CONTENT_TYPE'];
+                    $header['content-type']=$server['CONTENT_TYPE'];
                 }
                 if (isset($server['CONTENT_LENGTH'])) {
-                    $header['content-length'] = $server['CONTENT_LENGTH'];
+                    $header['content-length']=$server['CONTENT_LENGTH'];
                 }
             }
-            $this->header = array_change_key_case($header);
+            $this->header=array_change_key_case($header);
         }
         if (is_array($name)) {
-            return $this->header = array_merge($this->header, $name);
+            return $this->header=array_merge($this->header, $name);
         }
         if ('' === $name) {
             return $this->header;
         }
-        $name = str_replace('_', '-', strtolower($name));
+        $name=str_replace('_', '-', strtolower($name));
         return isset($this->header[$name]) ? $this->header[$name] : $default;
     }
 
@@ -925,24 +925,24 @@ 
      * @param string|array  $filter 过滤函数
      * @return mixed
      */
-    public function input($data = [], $name = '', $default = null, $filter = '')
+    public function input($data=[], $name='', $default=null, $filter='')
     {
         if (false === $name) {
             // 获取原始数据
             return $data;
         }
-        $name = (string) $name;
+        $name=(string) $name;
         if ('' != $name) {
             // 解析name
             if (strpos($name, '/')) {
-                list($name, $type) = explode('/', $name);
+                list($name, $type)=explode('/', $name);
             } else {
-                $type = 's';
+                $type='s';
             }
             // 按.拆分成多维数组进行判断
             foreach (explode('.', $name) as $val) {
                 if (isset($data[$val])) {
-                    $data = $data[$val];
+                    $data=$data[$val];
                 } else {
                     // 无输入数据，返回默认值
                     return $default;
@@ -955,17 +955,17 @@ 
 
         // 解析过滤器
         if (is_null($filter)) {
-            $filter = [];
+            $filter=[];
         } else {
-            $filter = $filter ?: $this->filter;
+            $filter=$filter ?: $this->filter;
             if (is_string($filter)) {
-                $filter = explode(',', $filter);
+                $filter=explode(',', $filter);
             } else {
-                $filter = (array) $filter;
+                $filter=(array) $filter;
             }
         }
 
-        $filter[] = $default;
+        $filter[]=$default;
         if (is_array($data)) {
             array_walk_recursive($data, [$this, 'filterValue'], $filter);
             reset($data);
@@ -985,12 +985,12 @@ 
      * @param mixed $filter 过滤规则
      * @return mixed
      */
-    public function filter($filter = null)
+    public function filter($filter=null)
     {
         if (is_null($filter)) {
             return $this->filter;
         } else {
-            $this->filter = $filter;
+            $this->filter=$filter;
         }
     }
 
@@ -1003,25 +1003,25 @@ 
      */
     private function filterValue(&$value, $key, $filters)
     {
-        $default = array_pop($filters);
+        $default=array_pop($filters);
         foreach ($filters as $filter) {
             if (is_callable($filter)) {
                 // 调用函数或者方法过滤
-                $value = call_user_func($filter, $value);
+                $value=call_user_func($filter, $value);
             } elseif (is_scalar($value)) {
                 if (strpos($filter, '/')) {
                     // 正则过滤
                     if (!preg_match($filter, $value)) {
                         // 匹配不成功返回默认值
-                        $value = $default;
+                        $value=$default;
                         break;
                     }
                 } elseif (!empty($filter)) {
                     // filter函数不存在时, 则使用filter_var进行过滤
                     // filter为非整形值时, 调用filter_id取得过滤id
-                    $value = filter_var($value, is_int($filter) ? $filter : filter_id($filter));
+                    $value=filter_var($value, is_int($filter) ? $filter : filter_id($filter));
                     if (false === $value) {
-                        $value = $default;
+                        $value=$default;
                         break;
                     }
                 }
@@ -1039,7 +1039,7 @@ 
     {
         // 过滤查询特殊字符
         if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
-            $value .= ' ';
+            $value.=' ';
         }
         // TODO 其他安全过滤
     }
@@ -1055,27 +1055,27 @@ 
         switch (strtolower($type)) {
             // 数组
             case 'a':
-                $data = (array) $data;
+                $data=(array) $data;
                 break;
             // 数字
             case 'd':
-                $data = (int) $data;
+                $data=(int) $data;
                 break;
             // 浮点
             case 'f':
-                $data = (float) $data;
+                $data=(float) $data;
                 break;
             // 布尔
             case 'b':
-                $data = (boolean) $data;
+                $data=(boolean) $data;
                 break;
             // 字符串
             case 's':
             default:
                 if (is_scalar($data)) {
-                    $data = (string) $data;
+                    $data=(string) $data;
                 } else {
-                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                    throw new \InvalidArgumentException('variable type error：'.gettype($data));
                 }
         }
     }
@@ -1088,17 +1088,17 @@ 
      * @param bool      $checkEmpty 是否检测空值
      * @return mixed
      */
-    public function has($name, $type = 'param', $checkEmpty = false)
+    public function has($name, $type='param', $checkEmpty=false)
     {
         if (empty($this->$type)) {
-            $param = $this->$type();
+            $param=$this->$type();
         } else {
-            $param = $this->$type;
+            $param=$this->$type;
         }
         // 按.拆分成多维数组进行判断
         foreach (explode('.', $name) as $val) {
             if (isset($param[$val])) {
-                $param = $param[$val];
+                $param=$param[$val];
             } else {
                 return false;
             }
@@ -1113,16 +1113,16 @@ 
      * @param string        $type 变量类型
      * @return mixed
      */
-    public function only($name, $type = 'param')
+    public function only($name, $type='param')
     {
-        $param = $this->$type();
+        $param=$this->$type();
         if (is_string($name)) {
-            $name = explode(',', $name);
+            $name=explode(',', $name);
         }
-        $item = [];
+        $item=[];
         foreach ($name as $key) {
             if (isset($param[$key])) {
-                $item[$key] = $param[$key];
+                $item[$key]=$param[$key];
             }
         }
         return $item;
@@ -1135,11 +1135,11 @@ 
      * @param string        $type 变量类型
      * @return mixed
      */
-    public function except($name, $type = 'param')
+    public function except($name, $type='param')
     {
-        $param = $this->$type();
+        $param=$this->$type();
         if (is_string($name)) {
-            $name = explode(',', $name);
+            $name=explode(',', $name);
         }
         foreach ($name as $key) {
             if (isset($param[$key])) {
@@ -1156,7 +1156,7 @@ 
      */
     public function isSsl()
     {
-        $server = array_merge($_SERVER, $this->server);
+        $server=array_merge($_SERVER, $this->server);
         if (isset($server['HTTPS']) && ('1' == $server['HTTPS'] || 'on' == strtolower($server['HTTPS']))) {
             return true;
         } elseif (isset($server['REQUEST_SCHEME']) && 'https' == $server['REQUEST_SCHEME']) {
@@ -1175,10 +1175,10 @@ 
      * @param bool $ajax  true 获取原始ajax请求
      * @return bool
      */
-    public function isAjax($ajax = false)
+    public function isAjax($ajax=false)
     {
-        $value  = $this->server('HTTP_X_REQUESTED_WITH', '', 'strtolower');
-        $result = ('xmlhttprequest' == $value) ? true : false;
+        $value=$this->server('HTTP_X_REQUESTED_WITH', '', 'strtolower');
+        $result=('xmlhttprequest' == $value) ? true : false;
         if (true === $ajax) {
             return $result;
         } else {
@@ -1192,9 +1192,9 @@ 
      * @param bool $pjax  true 获取原始pjax请求
      * @return bool
      */
-    public function isPjax($pjax = false)
+    public function isPjax($pjax=false)
     {
-        $result = !is_null($this->server('HTTP_X_PJAX')) ? true : false;
+        $result=!is_null($this->server('HTTP_X_PJAX')) ? true : false;
         if (true === $pjax) {
             return $result;
         } else {
@@ -1208,33 +1208,33 @@ 
      * @param boolean   $adv 是否进行高级模式获取（有可能被伪装）
      * @return mixed
      */
-    public function ip($type = 0, $adv = false)
+    public function ip($type=0, $adv=false)
     {
-        $type      = $type ? 1 : 0;
-        static $ip = null;
+        $type=$type ? 1 : 0;
+        static $ip=null;
         if (null !== $ip) {
             return $ip[$type];
         }
 
         if ($adv) {
             if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-                $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
-                $pos = array_search('unknown', $arr);
+                $arr=explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+                $pos=array_search('unknown', $arr);
                 if (false !== $pos) {
                     unset($arr[$pos]);
                 }
-                $ip = trim(current($arr));
+                $ip=trim(current($arr));
             } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
-                $ip = $_SERVER['HTTP_CLIENT_IP'];
+                $ip=$_SERVER['HTTP_CLIENT_IP'];
             } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-                $ip = $_SERVER['REMOTE_ADDR'];
+                $ip=$_SERVER['REMOTE_ADDR'];
             }
         } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-            $ip = $_SERVER['REMOTE_ADDR'];
+            $ip=$_SERVER['REMOTE_ADDR'];
         }
         // IP地址合法验证
-        $long = sprintf("%u", ip2long($ip));
-        $ip   = $long ? [$ip, $long] : ['0.0.0.0', 0];
+        $long=sprintf("%u", ip2long($ip));
+        $ip=$long ? [$ip, $long] : ['0.0.0.0', 0];
         return $ip[$type];
     }
 
@@ -1325,12 +1325,12 @@ 
      */
     public function contentType()
     {
-        $contentType = $this->server('CONTENT_TYPE');
+        $contentType=$this->server('CONTENT_TYPE');
         if ($contentType) {
             if (strpos($contentType, ';')) {
-                list($type) = explode(';', $contentType);
+                list($type)=explode(';', $contentType);
             } else {
-                $type = $contentType;
+                $type=$contentType;
             }
             return trim($type);
         }
@@ -1343,10 +1343,10 @@ 
      * @param array $route 路由名称
      * @return array
      */
-    public function routeInfo($route = [])
+    public function routeInfo($route=[])
     {
         if (!empty($route)) {
-            $this->routeInfo = $route;
+            $this->routeInfo=$route;
         } else {
             return $this->routeInfo;
         }
@@ -1358,10 +1358,10 @@ 
      * @param array  $dispatch 调度信息
      * @return array
      */
-    public function dispatch($dispatch = null)
+    public function dispatch($dispatch=null)
     {
         if (!is_null($dispatch)) {
-            $this->dispatch = $dispatch;
+            $this->dispatch=$dispatch;
         }
         return $this->dispatch;
     }
@@ -1372,10 +1372,10 @@ 
      * @param string $module 模块名
      * @return string|Request
      */
-    public function module($module = null)
+    public function module($module=null)
     {
         if (!is_null($module)) {
-            $this->module = $module;
+            $this->module=$module;
             return $this;
         } else {
             return $this->module ?: '';
@@ -1388,10 +1388,10 @@ 
      * @param string $controller 控制器名
      * @return string|Request
      */
-    public function controller($controller = null)
+    public function controller($controller=null)
     {
         if (!is_null($controller)) {
-            $this->controller = $controller;
+            $this->controller=$controller;
             return $this;
         } else {
             return $this->controller ?: '';
@@ -1404,10 +1404,10 @@ 
      * @param string $action 操作名
      * @return string|Request
      */
-    public function action($action = null)
+    public function action($action=null)
     {
         if (!is_null($action)) {
-            $this->action = $action;
+            $this->action=$action;
             return $this;
         } else {
             return $this->action ?: '';
@@ -1420,10 +1420,10 @@ 
      * @param string $lang 语言名
      * @return string|Request
      */
-    public function langset($lang = null)
+    public function langset($lang=null)
     {
         if (!is_null($lang)) {
-            $this->langset = $lang;
+            $this->langset=$lang;
             return $this;
         } else {
             return $this->langset ?: '';
@@ -1438,7 +1438,7 @@ 
     public function getContent()
     {
         if (is_null($this->content)) {
-            $this->content = $this->input;
+            $this->content=$this->input;
         }
         return $this->content;
     }
@@ -1460,12 +1460,12 @@ 
      * @param mixed  $type 令牌生成方法
      * @return string
      */
-    public function token($name = '__token__', $type = 'md5')
+    public function token($name='__token__', $type='md5')
     {
-        $type  = is_callable($type) ? $type : 'md5';
-        $token = call_user_func($type, $_SERVER['REQUEST_TIME_FLOAT']);
+        $type=is_callable($type) ? $type : 'md5';
+        $token=call_user_func($type, $_SERVER['REQUEST_TIME_FLOAT']);
         if ($this->isAjax()) {
-            header($name . ': ' . $token);
+            header($name.': '.$token);
         }
         Session::set($name, $token);
         return $token;
@@ -1479,17 +1479,17 @@ 
      * @param array  $except 缓存排除
      * @return void
      */
-    public function cache($key, $expire = null, $except = [])
+    public function cache($key, $expire=null, $except=[])
     {
         if (false !== $key && $this->isGet() && !$this->isCheckCache) {
             // 标记请求缓存检查
-            $this->isCheckCache = true;
+            $this->isCheckCache=true;
             if (false === $expire) {
                 // 关闭当前缓存
                 return;
             }
             if ($key instanceof \Closure) {
-                $key = call_user_func_array($key, [$this]);
+                $key=call_user_func_array($key, [$this]);
             } elseif (true === $key) {
                 foreach ($except as $rule) {
                     if (0 === strpos($this->url(), $rule)) {
@@ -1497,44 +1497,44 @@ 
                     }
                 }
                 // 自动缓存功能
-                $key = md5($this->host()) . '__URL__';
+                $key=md5($this->host()).'__URL__';
             } elseif (strpos($key, '|')) {
-                list($key, $fun) = explode('|', $key);
+                list($key, $fun)=explode('|', $key);
             }
             // 特殊规则替换
             if (false !== strpos($key, '__')) {
-                $key = str_replace(['__MODULE__', '__CONTROLLER__', '__ACTION__', '__URL__', ''], [$this->module, $this->controller, $this->action, md5($this->url())], $key);
+                $key=str_replace(['__MODULE__', '__CONTROLLER__', '__ACTION__', '__URL__', ''], [$this->module, $this->controller, $this->action, md5($this->url())], $key);
             }
 
             if (false !== strpos($key, ':')) {
-                $param = $this->param();
+                $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());
+                    $key=md5($this->url());
                 } else {
                     return;
                 }
             }
             if (isset($fun)) {
-                $key = $fun($key);
+                $key=$fun($key);
             }
 
             if (strtotime($this->server('HTTP_IF_MODIFIED_SINCE')) + $expire > $_SERVER['REQUEST_TIME']) {
                 // 读取缓存
-                $response = Response::create()->code(304);
+                $response=Response::create()->code(304);
                 throw new \think\exception\HttpResponseException($response);
             } elseif (Cache::has($key)) {
-                list($content, $header) = Cache::get($key);
-                $response               = Response::create($content)->header($header);
+                list($content, $header)=Cache::get($key);
+                $response=Response::create($content)->header($header);
                 throw new \think\exception\HttpResponseException($response);
             } else {
-                $this->cache = [$key, $expire];
+                $this->cache=[$key, $expire];
             }
         }
     }
@@ -1556,12 +1556,12 @@ 
      * @param mixed  $obj 绑定的对象实例
      * @return mixed
      */
-    public function bind($name, $obj = null)
+    public function bind($name, $obj=null)
     {
         if (is_array($name)) {
-            $this->bind = array_merge($this->bind, $name);
+            $this->bind=array_merge($this->bind, $name);
         } else {
-            $this->bind[$name] = $obj;
+            $this->bind[$name]=$obj;
         }
     }
 
@@ -1572,7 +1572,7 @@ 
 
     public function __set($name, $value)
     {
-        $this->bind[$name] = $value;
+        $this->bind[$name]=$value;
     }
 
     public function __get($name)