Merge pull request #86 from php-api-clients/correct-constructor-types

Correct constructor types

Author: WyriHaximus

src/Generator/Schema.php

@@ -169,7 +169,8 @@ private static function fillUpSchema(string $name, string $namespace, string $cl
 
 
             $propertyStmt->setType(($propertyType === 'array' ? '' : $nullable) . $propertyType);
-            $constructor->addParam((new Param($propertyName))->setType($propertyType))->addStmt(
+            $constructorParam = (new Param($propertyName))->setType($propertyType);
+            $constructor->addStmt(
                 new Node\Expr\Assign(
                     new Node\Expr\PropertyFetch(
                         new Node\Expr\Variable('this'),
@@ -184,17 +185,20 @@ private static function fillUpSchema(string $name, string $namespace, string $cl
             if (is_array($property->anyOf) && $property->anyOf[0] instanceof OpenAPiSchema/* && array_key_exists(spl_object_hash($property->anyOf[0]), $schemaClassNameMap)*/) {
                 $fqcnn = '\\' . $rootNamespace . '\\' . $schemaRegistry->get($property->anyOf[0], $className . '\\' . (new Convert($propertyName))->toPascal());
                 $propertyStmt->setType($nullable . $fqcnn);
+                $constructorParam->setType($nullable . $fqcnn);
                 $setDefaylt = false;
             } else if (is_array($property->allOf) && $property->allOf[0] instanceof OpenAPiSchema/* && array_key_exists(spl_object_hash($property->allOf[0]), $schemaClassNameMap)*/) {
                 $fqcnn = '\\' . $rootNamespace . '\\' . $schemaRegistry->get($property->allOf[0], $className . '\\' . (new Convert($propertyName))->toPascal());
                 $propertyStmt->setType($nullable . $fqcnn);
+                $constructorParam->setType($nullable . $fqcnn);
                 $setDefaylt = false;
             }
 
 //            if (($property->type  === 'object' || (is_array($property->type) && count($property->type) === 2)) && $property instanceof OpenAPiSchema/* && array_key_exists(spl_object_hash($property), $schemaClassNameMap)*/) {
             if ($propertyType  === 'object') {
                 $fqcnn = '\\' . $rootNamespace . '\\' . $schemaRegistry->get($property, $className . '\\' . (new Convert($propertyName))->toPascal());
                 $propertyStmt->setType($nullable . $fqcnn);
+                $constructorParam->setType($nullable . $fqcnn);
                 $setDefaylt = false;
             }
 
@@ -222,6 +226,7 @@ private static function fillUpSchema(string $name, string $namespace, string $cl
             }
 
             $class->addStmt($propertyStmt);
+            $constructor->addParam($constructorParam);
         }
 
         if (count($constructDocBlock) > 0) {