Did you know input was set to json content if there is json contant

Author: joeySchentrup

sample/src/Routes/Post.php

@@ -22,7 +22,6 @@ class PostRequest extends AbstractRequest
     public function __construct(
         #[HeaderRequestParam(name: 'X-My-Authorization')]
         public readonly string $authorization,
-        #[CookieRequestParam(name: 'X-My-Cookie')]
         public readonly string $someVar,
         public readonly string $someMessage,
         public readonly PostRequestSubObject $subObject,

src/Model/Request/RequestParser.php

@@ -21,9 +21,8 @@ public static function generateRequest(
         }
 
         $propertyTypes = self::getParamTypes($requestClass, $method);
-        $cacheJsonContent = null;
         $constructorArgs = array_map(
-            fn (RequestProperty $propertyType) => self::getConstructorArgument($request, $propertyType, $cacheJsonContent),
+            fn (RequestProperty $propertyType) => self::getConstructorArgument($request, $propertyType),
             $propertyTypes,
         );
 
@@ -37,16 +36,10 @@ public static function generateRequest(
     private static function getConstructorArgument(
         Request $request,
         RequestProperty $propertyType,
-        ?array &$cacheJsonContent,
     ): mixed {
-        if ($propertyType->type === InputParamType::Json && !isset($cacheJsonContent)) {
-            $cacheJsonContent = $request->content->getParsedBody() ?? [];
-        }
-
         $content = (match ($propertyType->type) {
             InputParamType::Query => $request->query[$propertyType->name] ?? null,
-            InputParamType::Json => $cacheJsonContent[$propertyType->name] ?? null,
-            InputParamType::Input => $request->input[$propertyType->name] ?? null,
+            InputParamType::Input, InputParamType::Json => $request->input[$propertyType->name] ?? null,
             InputParamType::Header => $request->headers[strtolower($propertyType->name)] ?? null,
             InputParamType::Cookie => $request->cookies[$propertyType->name] ?? null,
             default => null,
@@ -111,6 +104,7 @@ public static function getParamTypes(string $requestClass, ?string $httpMethod,
 
         $constructorParams = $constructor->getParameters();
         $result = [];
+        $contentType = null;
 
         foreach ($constructorParams as $param) {
             $property = $reflectionClass->getProperty($param->getName());
@@ -150,6 +144,17 @@ public static function getParamTypes(string $requestClass, ?string $httpMethod,
                 $subProperties = RequestParser::getParamTypes($propertyType->getName(), $httpMethod, false);
             }
 
+            if (!isset($contentType) && in_array($inputParamType, [InputParamType::Input, InputParamType::Json], true)) {
+                $contentType = $inputParamType;
+            } elseif (in_array($inputParamType, [InputParamType::Input, InputParamType::Json], true)
+                && $inputParamType != $contentType
+            ) {
+                throw new InvalidArgumentException(
+                    "Request class $requestClass has conflicting input types for property $name. "
+                    . "Cannot be both $inputParamType and $contentType",
+                );
+            }
+
             $result[] = new RequestProperty(
                 name: $name,
                 propertyName: $property->getName(),