fix(mapper): don't overwrite request fields (#1487)

Author: aazsamir

packages/http/src/Mappers/PsrRequestToGenericRequestMapper.php

@@ -56,8 +56,6 @@ public function map(mixed $from, mixed $to): GenericRequest
             'query' => $query,
             'files' => $uploads,
             'cookies' => Arr\map_iterable($_COOKIE, static fn (string $value, string $key) => new Cookie($key, $value)),
-            ...$data,
-            ...$uploads,
         ])
             ->to(GenericRequest::class);
     }

tests/Integration/Mapper/PsrRequestToRequestMapperTest.php

@@ -10,6 +10,7 @@
 use Laminas\Diactoros\Uri;
 use Tempest\Http\GenericRequest;
 use Tempest\Http\Mappers\PsrRequestToGenericRequestMapper;
+use Tempest\Http\Method;
 use Tempest\Http\Request;
 use Tempest\Http\Upload;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
@@ -90,4 +91,26 @@ public function test_files(): void
         $this->assertSame('hello', $upload->getClientFilename());
         $this->assertSame('application/octet-stream', $upload->getClientMediaType());
     }
+
+    public function test_body_field_in_body(): void
+    {
+        $psrRequest = $this->http->makePsrRequest(
+            '/',
+            Method::POST,
+            body: [
+                'body' => 'text',
+            ],
+        );
+
+        $mapper = new PsrRequestToGenericRequestMapper();
+
+        $request = $mapper->map($psrRequest, GenericRequest::class);
+
+        $this->assertSame(
+            [
+                'body' => 'text',
+            ],
+            $request->body,
+        );
+    }
 }