Merge branch 'master' of https://github.com/top-think/think

library/think/App.php

@@ -373,6 +373,8 @@ class App
             // 路由无效默认分析为模块/控制器/操作/参数...方式URL
             $result = Route::parseUrl($_SERVER['PATH_INFO'], $depr);
         }
+        //保证$_REQUEST正常取值
+        $_REQUEST = array_merge($_POST, $_GET, $_COOKIE);
         // 注册调度机制
         self::dispatch($result);
     }

library/think/View.php

@@ -40,14 +40,15 @@ class View
         // 视图驱动命名空间
         'namespace'     => '\\think\\view\\driver\\',
         // 模板引擎配置参数
-        'template'      => [
-            'type' => 'think',
-        ],
+        'template'      => [],
     ];
 
     public function __construct(array $config = [])
     {
         $this->config($config);
+        if (!isset($this->config['template']['type'])) {
+            $this->config['template']['type'] = 'think';
+        }
     }
 
     /**
@@ -122,6 +123,7 @@ class View
             if (empty($this->config['view_path']) && defined('VIEW_PATH')) {
                 $this->config['view_path'] = VIEW_PATH;
             }
+
             $config = array_merge($config, [
                 'view_path'   => $this->config['view_path'],
                 'view_suffix' => $this->config['view_suffix'],