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