Fixed issue #128 - Fixed content type construction parameter generation.

Author: DizzyDrift

example/PetStoreClient/doc/petstore3.json

@@ -116,6 +116,21 @@
         "summary": "Add a new pet to the store",
         "description": "Add a new pet to the store",
         "operationId": "addPet",
+        "parameters": [
+          {
+              "in" : "header",
+              "name": "Content-Type",
+              "required": true,
+              "schema": {
+                  "type": "string",
+                  "enum": [
+                      "application/json",
+                      "approved",
+                      "delivered"
+                  ]
+              }
+          }
+        ],
         "requestBody": {
           "description": "Create a new pet in the store",
           "content": {

example/PetStoreClient/src/Request/AddPetRequest.php

@@ -11,17 +11,24 @@
 namespace OpenApi\PetStoreClient\Request;
 
 use OpenApi\PetStoreClient\Schema\Pet;
+use OpenApi\PetStoreClient\Schema\SerializableInterface;
 
 class AddPetRequest implements RequestInterface
 {
-    private Pet $pet;
+    public const CONTENT_TYPE_APPLICATION_JSON = 'application/json';
+
+    public const CONTENT_TYPE_APPROVED = 'approved';
+
+    public const CONTENT_TYPE_DELIVERED = 'delivered';
 
     private string $contentType;
 
-    public function __construct(Pet $pet, string $contentType)
+    private Pet $pet;
+
+    public function __construct(string $contentType, Pet $pet)
     {
-        $this->pet         = $pet;
         $this->contentType = $contentType;
+        $this->pet         = $pet;
     }
 
     public function getContentType(): string
@@ -56,7 +63,11 @@ public function getCookies(): array
 
     public function getHeaders(): array
     {
-        return ['Content-Type' => $this->contentType];
+        return array_merge(['Content-Type' => $this->contentType], array_map(static function ($value) {
+            return $value instanceof SerializableInterface ? $value->toArray() : $value;
+        }, array_filter(['Content-Type' => $this->contentType], static function ($value) {
+            return null !== $value;
+        })));
     }
 
     /**

example/petstore3.json

@@ -116,6 +116,21 @@
         "summary": "Add a new pet to the store",
         "description": "Add a new pet to the store",
         "operationId": "addPet",
+        "parameters": [
+          {
+              "in" : "header",
+              "name": "Content-Type",
+              "required": true,
+              "schema": {
+                  "type": "string",
+                  "enum": [
+                      "application/json",
+                      "approved",
+                      "delivered"
+                  ]
+              }
+          }
+        ],
         "requestBody": {
           "description": "Create a new pet in the store",
           "content": {

src/Generator/RequestGenerator.php

@@ -28,9 +28,13 @@ class RequestGenerator extends MutatorAccessorClassGeneratorAbstract
 
     public const SUBDIRECTORY = 'Request/';
 
+    private const CONTENT_TYPE_PARAMETER_NAME = 'contentType';
+
     /** @var SecurityStrategyInterface[] */
     private array $securityStrategies;
 
+    private bool $isContentTypeEnum = false;
+
     public function __construct(
         string $baseNamespace,
         CodeBuilder $builder,
@@ -45,6 +49,7 @@ public function __construct(
     public function generate(Specification $specification, PhpFileCollection $fileRegistry): void
     {
         foreach ($specification->getOperations() as $operation) {
+            $this->isContentTypeEnum = false;
             $this->generateRequest($fileRegistry, $operation, $specification);
         }
     }
@@ -92,6 +97,7 @@ protected function generateEnums(Request $request): array
     protected function generateProperties(Request $request, Operation $operation, Specification $specification): array
     {
         $statements = [];
+        $fieldNames = [];
 
         foreach ($request->fields as $field) {
             if ($field->isComposite()) {
@@ -117,13 +123,21 @@ protected function generateProperties(Request $request, Operation $operation, Sp
             }
 
             $statements[] = $this->generateProperty($field);
+            $fieldNames[] = $field->getPhpVariableName();
         }
 
-        $default = null;
-        if (count($request->bodyContentTypes) < 2) {
+        $default               = null;
+        $bodyContentTypesCount = count($request->bodyContentTypes);
+        if ($bodyContentTypesCount < 2) {
             $default = $this->builder->val($request->bodyContentTypes[0] ?? '');
         }
-        $statements[] = $this->builder->localProperty('contentType', 'string', 'string', false, $default);
+
+        if (
+            ($bodyContentTypesCount < 2 || !$this->phpVersion->isConstructorPropertyPromotionSupported())
+            && !in_array(self::CONTENT_TYPE_PARAMETER_NAME, $fieldNames, true)
+        ) {
+            $statements[] = $this->builder->localProperty(self::CONTENT_TYPE_PARAMETER_NAME, 'string', 'string', false, $default);
+        }
 
         foreach ($this->securityStrategies as $securityStrategy) {
             array_push($statements, ...$securityStrategy->getProperties($operation, $specification));
@@ -137,6 +151,7 @@ protected function generateConstructor(
         Operation $operation,
         Specification $specification
     ): ?ClassMethod {
+        $paramNames  = [];
         $params      = [];
         $paramInits  = [];
         $validations = [];
@@ -163,7 +178,16 @@ protected function generateConstructor(
                     }
                 }
 
-                $params[] = $param;
+                $params[]     = $param;
+                $paramNames[] = $field->getPhpVariableName();
+
+                if (
+                    $field->isEnum()
+                    && $this->phpVersion->isEnumSupported()
+                    && $field->getPhpVariableName() === self::CONTENT_TYPE_PARAMETER_NAME
+                ) {
+                    $this->isContentTypeEnum = true;
+                }
 
                 $paramInits[] = $this->builder->assign(
                     $this->builder->localPropertyFetch($field->getPhpVariableName()),
@@ -177,14 +201,12 @@ protected function generateConstructor(
             array_push($paramInits, ...$securityStrategy->getConstructorParamInits($operation, $specification));
         }
 
-        if (count($request->bodyContentTypes) > 1) {
-            $contentTypeVariableName = 'contentType';
-
-            $params[] = $this->builder->param($contentTypeVariableName)->setType('string');
+        if (count($request->bodyContentTypes) > 1 && !in_array(self::CONTENT_TYPE_PARAMETER_NAME, $paramNames, true)) {
+            $params[] = $this->builder->param(self::CONTENT_TYPE_PARAMETER_NAME)->setType('string');
 
             $paramInits[] = $this->builder->assign(
-                $this->builder->localPropertyFetch($contentTypeVariableName),
-                $this->builder->var($contentTypeVariableName)
+                $this->builder->localPropertyFetch(self::CONTENT_TYPE_PARAMETER_NAME),
+                $this->builder->var(self::CONTENT_TYPE_PARAMETER_NAME)
             );
         }
 
@@ -242,8 +264,14 @@ private function generateSetters(Request $request): array
 
     private function generateGetContentType(): ClassMethod
     {
-        $return     = $this->builder->return($this->builder->localPropertyFetch('contentType'));
-        $returnType = 'string';
+        $localProperty = $this->builder->localPropertyFetch(self::CONTENT_TYPE_PARAMETER_NAME);
+        $returnType    = 'string';
+
+        if ($this->isContentTypeEnum) {
+            $localProperty = $this->builder->propertyFetch($localProperty, 'value');
+        }
+
+        $return = $this->builder->return($localProperty);
 
         return $this
             ->builder