From 0c99ac1383c8abbc2c8d30864a885d0057012cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 24 Oct 2023 15:20:55 +0800 Subject: [PATCH] eee --- Handler/OnRequest.php | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/Handler/OnRequest.php b/Handler/OnRequest.php index b0cfc46..dbd79f0 100644 --- a/Handler/OnRequest.php +++ b/Handler/OnRequest.php @@ -124,27 +124,25 @@ class OnRequest implements OnRequestInterface */ protected function constrictRequest(Request $request): ConstrictRequest { - $parsedBody = function () use ($request) { - $contentType = $request->header['content-type'] ?? 'application/json'; - if (\str_contains($contentType, 'json')) { - return \json_decode($request->getContent(), true); - } else if (\str_contains($contentType, 'xml')) { - return Xml::toArray($request->getContent()); - } else { - return $request->post ?? []; - } - }; - $constrictRequest = new ConstrictRequest(); - $constrictRequest->withHeaders($request->header ?? []) - ->withUri(new Uri($request)) - ->withProtocolVersion($request->server['server_protocol']) - ->withCookieParams($request->cookie ?? []) - ->withServerParams($request->server) - ->withQueryParams($request->get ?? []) - ->withParsedBody($parsedBody) - ->withUploadedFiles($request->files ?? []) - ->withMethod($request->getMethod()); - return $constrictRequest; + return (new ConstrictRequest()) + ->withHeaders($request->header ?? []) + ->withUri(new Uri($request)) + ->withProtocolVersion($request->server['server_protocol']) + ->withCookieParams($request->cookie ?? []) + ->withServerParams($request->server) + ->withQueryParams($request->get ?? []) + ->withParsedBody(function () use ($request) { + $contentType = $request->header['content-type'] ?? 'application/json'; + if (\str_contains($contentType, 'json')) { + return \json_decode($request->getContent(), true); + } else if (\str_contains($contentType, 'xml')) { + return Xml::toArray($request->getContent()); + } else { + return $request->post ?? []; + } + }) + ->withUploadedFiles($request->files ?? []) + ->withMethod($request->getMethod()); }