This commit is contained in:
2023-10-24 15:20:55 +08:00
parent 19d25a0be5
commit 0c99ac1383
+9 -11
View File
@@ -124,7 +124,14 @@ class OnRequest implements OnRequestInterface
*/ */
protected function constrictRequest(Request $request): ConstrictRequest protected function constrictRequest(Request $request): ConstrictRequest
{ {
$parsedBody = function () use ($request) { 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'; $contentType = $request->header['content-type'] ?? 'application/json';
if (\str_contains($contentType, 'json')) { if (\str_contains($contentType, 'json')) {
return \json_decode($request->getContent(), true); return \json_decode($request->getContent(), true);
@@ -133,18 +140,9 @@ class OnRequest implements OnRequestInterface
} else { } else {
return $request->post ?? []; 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 ?? []) ->withUploadedFiles($request->files ?? [])
->withMethod($request->getMethod()); ->withMethod($request->getMethod());
return $constrictRequest;
} }