chore(release): 1.0.0-beta.2

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

CHANGELOG.md

@@ -1,4 +1,16 @@
 # 版本更新日志
+## [1.0.0-beta.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-01-18)
+
+
+### ⚡ Performance Improvements | 性能优化
+
+* **exception:** 取消了必须是 apifox/postman 的设计 ([2167fd2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/2167fd209a3cc46ea77fc64909ff8adf71ec6ef0))
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **CoreMiddleware:** 修复如果直接输出 ResponseInterface 实例会报错的问题 ([762acbb](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/762acbb368d6a901478fe3d6b2a3e30793f2c57c))
+
 ## [1.0.0-beta.1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.0...v1.0.0-beta.1) (2023-12-15)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-beta.1
+1.0.0-beta.2

composer.json

@@ -130,5 +130,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-beta.1"
+  "version": "1.0.0-beta.2"
 }

src/Exceptions/Handler/CommonHandler.php

@@ -72,10 +72,8 @@ class CommonHandler extends ExceptionHandler
         $message_name = config('common.response.message_name');
         $is_testing = config('app_status') === true;
         $this->request?->url();
-        $is_debug = $this->request?->hasHeader('Postman-Token') || str_starts_with(
-            $this->request?->header('User-Agent', ''),
-            'apifox'
-        );
+
+        $is_debug = $is_testing;
         $error_type = $throwable::class;
         $request_time = Carbon::now()->toDateTimeString();
         $request_data = Json::encode($this->request?->getParsedBody());

src/Middleware/CommonCoreMiddleware.php

@@ -47,14 +47,14 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToResponse(
         $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponsePlusInterface {
         $style = $this->apiStyleService->get();
 
-        if ($style === ApiStyleService::RESTFUL) {
-            $response = $this->transferToRestfulResponse($response, $request);
-        } else {
-            $response = $this->transferToClassicResponse($response, $request);
+        if (!($response instanceof ResponseInterface)) {
+            $response = $style === ApiStyleService::RESTFUL
+                ? $this->transferToRestfulResponse($response, $request)
+                : $this->transferToClassicResponse($response, $request);
         }
 
         return new ResponsePlusProxy($response);
@@ -68,7 +68,7 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToRestfulResponse(
         null|array|Arrayable|Jsonable|ResponseInterface|string $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponseInterface {
         // 分页数据
         if ($response instanceof LengthAwarePaginatorInterface) {
@@ -103,7 +103,7 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToClassicResponse(
         null|array|Arrayable|Jsonable|ResponseInterface|string $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponseInterface {
         $code_name = config('common.response.code_name');
         $message_name = config('common.response.message_name');
@@ -162,6 +162,9 @@ class CommonCoreMiddleware extends CoreMiddleware
                 new SwooleStream(Json::encode($response))
             );
         }
+        if ($response instanceof ResponseInterface) {
+            return $response;
+        }
         // 其他默认按字符串处理
         return $this->response()->withAddedHeader(Header::CONTENT_TYPE, 'text/plain')->withBody(
             new SwooleStream((string)$response)