eee

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