bug fix

Author: ichynul

src/think/View.php

@@ -138,23 +138,11 @@ private function parseTemplate(string $template)
         // 分析模板文件规则
         $request = request();
 
-        $module = '';
-        $controller = '';
-        $action = '';
-
-        if ($request->route) {
-            $requestPath = strtolower($request->route->getPath());
-            $explode = explode('/', trim($requestPath, '/'));
-            $module = $explode[0] ?: 'index';
-            $controller  = $explode[1] ?? 'index';
-            $action  = $explode[2] ?? 'index';
-        } else {
-            $requestPath = strtolower($request->path());
-            $explode = explode('/', trim($requestPath, '/'));
-            $module = $explode[0] ?: 'index';
-            $controller  = $explode[1] ?? 'index';
-            $action  = $explode[2] ?? 'index';
-        }
+        $requestPath = strtolower(str_replace('[.html]', '', $request->path()));
+        $explode = explode('/', trim($requestPath, '/'));
+        $module = $explode[0] ?: 'index';
+        $controller  = $explode[1] ?? 'index';
+        $action  = $explode[2] ?? 'index';
 
         // 获取视图根目录
         if (strpos($template, '@')) {

think/exception/HttpResponseException.php

@@ -14,7 +14,7 @@
 
 use Webman\Http\Request;
 use Webman\Http\Response;
-use support\exception\BusinessException;
+use Webman\Exception\BusinessException;
 
 /**
  * HTTP响应异常
@@ -34,15 +34,22 @@ public function __construct(Response $response)
     /**
      * Undocumented function
      *
-     * @return Response
+     * @return Response|null
      */
-    public function getResponse()
+    public function getResponse(): ?Response
     {
         return $this->response;
     }
 
+     /**
+     * Render an exception into an HTTP response.
+     * @param Request $request
+     * @return Response|null
+     */
     public function render(Request $request): ?Response
     {
-        return $this->response;
+        //返回一个新对象，
+        //避免 App::exceptionResponse() 中 $response->exception($e) 造成循环引用
+        return new Response($this->response->getStatusCode(), $this->response->getHeaders(), $this->response->rawBody());
     }
 }