view助手函数增加replace参数 取消ViewResponse类的vars方法 使用assign方法替代

helper.php

@@ -421,12 +421,13 @@ if (!function_exists('view')) {
      * 渲染模板输出
      * @param string    $template 模板文件
      * @param array     $vars 模板变量
+     * @param array     $replace 模板替换
      * @param integer   $code 状态码
      * @return \think\response\View
      */
-    function view($template = '', $vars = [], $code = 200)
+    function view($template = '', $vars = [], $replace = [], $code = 200)
     {
-        return Response::create($template, 'view', $code)->vars($vars);
+        return Response::create($template, 'view', $code)->replace($replace)->assign($vars);
     }
 }
 

library/think/exception/Handle.php

@@ -44,13 +44,13 @@ class Handle
                     'message' => $this->getMessage($exception),
                     'code'    => $this->getCode($exception),
                 ];
-                $log  = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
+                $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
             } else {
                 $data = [
                     'code'    => $this->getCode($exception),
                     'message' => $this->getMessage($exception),
                 ];
-                $log  = "[{$data['code']}]{$data['message']}";
+                $log = "[{$data['code']}]{$data['message']}";
             }
 
             Log::record($log, 'error');
@@ -103,7 +103,7 @@ class Handle
         $status   = $e->getStatusCode();
         $template = Config::get('http_exception_template');
         if (!App::$debug && !empty($template[$status])) {
-            return Response::create($template[$status], 'view')->vars(['e' => $e]);
+            return Response::create($template[$status], 'view')->assign(['e' => $e]);
         } else {
             return $this->convertExceptionToResponse($e);
         }

library/think/response/View.php

@@ -36,18 +36,6 @@ class View extends Response
             ->fetch($data, $this->vars, $this->replace);
     }
 
-    /**
-     * 视图变量赋值
-     * @access public
-     * @param array $vars 模板变量
-     * @return $this
-     */
-    public function vars($vars = [])
-    {
-        $this->vars = $vars;
-        return $this;
-    }
-
     /**
      * 获取视图变量
      * @access public
@@ -56,9 +44,9 @@ class View extends Response
      */
     public function getVars($name = null)
     {
-        if(is_null($name)){
+        if (is_null($name)) {
             return $this->vars;
-        }else{
+        } else {
             return isset($this->vars[$name]) ? $this->vars[$name] : null;
         }
     }