eee

2023-10-24 15:19:46 +08:00
parent f621513587
commit 19d25a0be5
1 changed files with 21 additions and 18 deletions
@@ -124,24 +124,27 @@ class OnRequest implements OnRequestInterface
     */
    protected function constrictRequest(Request $request): ConstrictRequest
    {
-        return (new ConstrictRequest())->withHeaders($request->header ?? [])
+        $parsedBody       = function () use ($request) {
-                                       ->withUri(new Uri($request))
+            $contentType = $request->header['content-type'] ?? 'application/json';
-                                       ->withProtocolVersion($request->server['server_protocol'])
+            if (\str_contains($contentType, 'json')) {
-                                       ->withCookieParams($request->cookie ?? [])
+                return \json_decode($request->getContent(), true);
-                                       ->withServerParams($request->server)
+            } else if (\str_contains($contentType, 'xml')) {
-                                       ->withQueryParams($request->get ?? [])
+                return Xml::toArray($request->getContent());
-                                       ->withParsedBody(function () use ($request) {
+            } else {
-                                           $contentType = $request->header['content-type'] ?? 'application/json';
+                return $request->post ?? [];
-                                           if (\str_contains($contentType, 'json')) {
+            }
-                                               return \json_decode($request->getContent(),true);
+        };
-                                           } else if (\str_contains($contentType, 'xml')) {
+        $constrictRequest = new ConstrictRequest();
-                                               return Xml::toArray($request->getContent());
+        $constrictRequest->withHeaders($request->header ?? [])
-                                           } else {
+                         ->withUri(new Uri($request))
-                                               return $request->post ?? [];
+                         ->withProtocolVersion($request->server['server_protocol'])
-                                           }
+                         ->withCookieParams($request->cookie ?? [])
-                                       })
+                         ->withServerParams($request->server)
-                                       ->withUploadedFiles($request->files ?? [])
+                         ->withQueryParams($request->get ?? [])
-                                       ->withMethod($request->getMethod());
+                         ->withParsedBody($parsedBody)
                         ->withUploadedFiles($request->files ?? [])
                         ->withMethod($request->getMethod());
        return $constrictRequest;
    }