Merge branch 'main' into feature/configure-vite-discovery

Author: NeoIsRecursive

CHANGELOG.md

@@ -45,10 +45,10 @@
         "carthage-software/mago": "0.26.1",
         "guzzlehttp/psr7": "^2.6.1",
         "league/flysystem-aws-s3-v3": "^3.0",
-        "league/flysystem-local": "^3.25.1",
         "league/flysystem-azure-blob-storage": "^3.0",
         "league/flysystem-ftp": "^3.0",
         "league/flysystem-google-cloud-storage": "^3.0",
+        "league/flysystem-local": "^3.25.1",
         "league/flysystem-memory": "^3.0",
         "league/flysystem-read-only": "^3.0",
         "league/flysystem-sftp-v3": "^3.0",

composer.json

@@ -8,7 +8,7 @@
 
 interface Kernel
 {
-    public const string VERSION = '1.1.0';
+    public const string VERSION = '1.2.1';
 
     public string $root {
         get;

packages/core/src/Kernel.php

@@ -4,13 +4,18 @@
 
 namespace Tempest\Http\Mappers;
 
+use ReflectionClass;
 use Tempest\Http\Request;
+use Tempest\Http\RequestParametersIncludedReservedNames;
 use Tempest\Mapper\Mapper;
 use Tempest\Mapper\Mappers\ArrayToObjectMapper;
+use Tempest\Reflection\ClassReflector;
+use Tempest\Reflection\PropertyReflector;
 use Tempest\Validation\Exceptions\ValidationFailed;
 use Tempest\Validation\Validator;
 
 use function Tempest\map;
+use function Tempest\Support\arr;
 
 final readonly class RequestToObjectMapper implements Mapper
 {
@@ -22,9 +27,17 @@ public function canMap(mixed $from, mixed $to): bool
     public function map(mixed $from, mixed $to): array|object
     {
         /** @var Request $from */
-        $data = $from->body;
+        $data = [...$from->files, ...$from->body, ...$from->query];
 
         if (is_a($to, Request::class, true)) {
+            $invalidReservedProperties = arr(new ClassReflector(Request::class)->getProperties())
+                ->map(fn (PropertyReflector $property) => $property->getName())
+                ->filter(fn (string $property) => array_key_exists($property, $data));
+
+            if ($invalidReservedProperties->isNotEmpty()) {
+                throw new RequestParametersIncludedReservedNames($to, $invalidReservedProperties);
+            }
+
             $data = [
                 ...[
                     'method' => $from->method,
@@ -36,8 +49,6 @@ public function map(mixed $from, mixed $to): array|object
                     'files' => $from->files,
                     'cookies' => $from->cookies,
                 ],
-                ...$from->files,
-                ...$from->query,
                 ...$data,
             ];
         }

packages/http/src/Mappers/RequestToObjectMapper.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Tempest\Http;
+
+use Exception;
+use Tempest\Support\Arr\ImmutableArray;
+
+final class RequestParametersIncludedReservedNames extends Exception
+{
+    public function __construct(string $requestClass, ImmutableArray $reservedProperties)
+    {
+        $message = sprintf(
+            'The request payload included data with reserved property names: %s. It could not be mapped to `%s`',
+            $reservedProperties->join('`, `')->wrap('`'),
+            $requestClass,
+        );
+
+        parent::__construct($message);
+    }
+}

packages/http/src/RequestParametersIncludedReservedNames.php

@@ -39,6 +39,8 @@ public function dispatch(Request|PsrRequest $request): Response
             $request = map($request)->with(PsrRequestToGenericRequestMapper::class)->do();
         }
 
+        $this->container->singleton(Request::class, fn () => $request);
+
         $callable = $this->getCallable();
 
         return $this->processResponse($callable($request));

packages/router/src/GenericRouter.php

@@ -43,7 +43,6 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
         // We register this newly created request object in the container
         // This makes it so that RequestInitializer is bypassed entirely when the controller action needs the request class
         // Making it so that we don't need to set any $_SERVER variables and stuff like that
-        $this->container->singleton(Request::class, fn () => $request);
         $this->container->singleton($request::class, fn () => $request);
 
         return $next($request);

packages/router/src/MatchRouteMiddleware.php

@@ -1,7 +1,7 @@
 {
 	"name": "vite-plugin-tempest",
 	"type": "module",
-	"version": "1.1.0",
+	"version": "1.2.1",
 	"author": "Enzo Innocenzi",
 	"license": "MIT",
 	"sideEffects": false,

packages/vite-plugin-tempest/package.json

@@ -162,7 +162,7 @@ public function test_insert_on_model_table_with_existing_relation(): void
 
     public function test_inserting_has_many_via_parent_model_throws_exception(): void
     {
-        $this->assertException(HasManyRelationCouldNotBeInsterted::class, function () {
+        $this->assertException(HasManyRelationCouldNotBeInsterted::class, function (): void {
             query(Book::class)
                 ->insert(
                     title: 'Timeline Taxi',
@@ -174,7 +174,7 @@ public function test_inserting_has_many_via_parent_model_throws_exception(): voi
 
     public function test_inserting_has_one_via_parent_model_throws_exception(): void
     {
-        $this->assertException(HasOneRelationCouldNotBeInserted::class, function () {
+        $this->assertException(HasOneRelationCouldNotBeInserted::class, function (): void {
             query(Book::class)
                 ->insert(
                     title: 'Timeline Taxi',

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Tempest\Integration\Route;
+
+use Tempest\Http\IsRequest;
+use Tempest\Http\Request;
+
+final class RequestForInvalidMap implements Request
+{
+    use IsRequest;
+}