eee

Handler/OnRequest.php

@@ -124,13 +124,9 @@ class OnRequest implements OnRequestInterface
      */
     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'])
-            ->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')) {
@@ -140,8 +136,7 @@ class OnRequest implements OnRequestInterface
                                            } else {
                                                return $request->post ?? [];
                                            }
-            })
+                                       })->withUploadedFiles($request->files ?? [])
-            ->withUploadedFiles($request->files ?? [])
                                        ->withMethod($request->getMethod());
     }