Merge pull request #42 from DoclerLabs/fix-mapping-nullable-mandatory-ref

Fix mapping nullable mandatory ref

Author: vsouz4

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.7.1] - 2021-05-31
+### Fixed
+- `nullable: true` for mandatory $ref was not checking for null before trying to map
+
 ## [5.7.0] - 2021-05-28
 ### Added
 - Support for `application/vnd.api+json` MIME type.

src/Generator/SchemaMapperGenerator.php

@@ -268,11 +268,23 @@ protected function generateMapStatementsForObject(Field $root, Variable $payload
         foreach ($requiredFields as $i => $field) {
             /** @var Field $field */
             if ($field->isComposite()) {
-                $requiredVars[] = $this->builder->methodCall(
-                    $this->builder->localPropertyFetch(SchemaMapperNaming::getPropertyName($field)),
-                    'toSchema',
-                    [$requiredResponseItems[$i]]
-                );
+                if ($field->isNullable()) {
+                    $requiredVars[] = $this->builder->ternary(
+                        $this->builder->notEquals($requiredResponseItems[$i], $this->builder->val(null)),
+                        $this->builder->methodCall(
+                            $this->builder->localPropertyFetch(SchemaMapperNaming::getPropertyName($field)),
+                            'toSchema',
+                            [$requiredResponseItems[$i]]
+                        ),
+                        $this->builder->val(null)
+                    );
+                } else {
+                    $requiredVars[] = $this->builder->methodCall(
+                        $this->builder->localPropertyFetch(SchemaMapperNaming::getPropertyName($field)),
+                        'toSchema',
+                        [$requiredResponseItems[$i]]
+                    );
+                }
             } elseif ($field->isDate()) {
                 $this->addImport(DateTimeImmutable::class);
                 if ($field->isNullable()) {

test/suite/functional/Generator/SchemaMapper/ItemMapper.php

@@ -16,21 +16,24 @@ class ItemMapper implements SchemaMapperInterface
 {
     private EmbeddedObjectMapper $embeddedObjectMapper;
 
-    public function __construct(EmbeddedObjectMapper $embeddedObjectMapper)
+    private EmbeddedNullableObjectMapper $embeddedNullableObjectMapper;
+
+    public function __construct(EmbeddedObjectMapper $embeddedObjectMapper, EmbeddedNullableObjectMapper $embeddedNullableObjectMapper)
     {
-        $this->embeddedObjectMapper = $embeddedObjectMapper;
+        $this->embeddedObjectMapper         = $embeddedObjectMapper;
+        $this->embeddedNullableObjectMapper = $embeddedNullableObjectMapper;
     }
 
     /**
      * @throws UnexpectedResponseBodyException
      */
     public function toSchema(array $payload): Item
     {
-        $missingFields = \implode(', ', \array_diff(['mandatoryInteger', 'mandatoryString', 'mandatoryEnum', 'mandatoryDate', 'mandatoryNullableDate', 'mandatoryFloat', 'mandatoryBoolean', 'mandatoryArray', 'mandatoryObject'], \array_keys($payload)));
+        $missingFields = \implode(', ', \array_diff(['mandatoryInteger', 'mandatoryString', 'mandatoryEnum', 'mandatoryDate', 'mandatoryNullableDate', 'mandatoryFloat', 'mandatoryBoolean', 'mandatoryArray', 'mandatoryObject', 'mandatoryNullableObject'], \array_keys($payload)));
         if (! empty($missingFields)) {
             throw new UnexpectedResponseBodyException('Required attributes for `Item` missing in the response body: ' . $missingFields);
         }
-        $schema = new Item($payload['mandatoryInteger'], $payload['mandatoryString'], $payload['mandatoryEnum'], new DateTimeImmutable($payload['mandatoryDate']), $payload['mandatoryNullableDate'] !== null ? new DateTimeImmutable($payload['mandatoryNullableDate']) : null, $payload['mandatoryFloat'], $payload['mandatoryBoolean'], $payload['mandatoryArray'], $this->embeddedObjectMapper->toSchema($payload['mandatoryObject']));
+        $schema = new Item($payload['mandatoryInteger'], $payload['mandatoryString'], $payload['mandatoryEnum'], new DateTimeImmutable($payload['mandatoryDate']), $payload['mandatoryNullableDate'] !== null ? new DateTimeImmutable($payload['mandatoryNullableDate']) : null, $payload['mandatoryFloat'], $payload['mandatoryBoolean'], $payload['mandatoryArray'], $this->embeddedObjectMapper->toSchema($payload['mandatoryObject']), $payload['mandatoryNullableObject'] !== null ? $this->embeddedNullableObjectMapper->toSchema($payload['mandatoryNullableObject']) : null);
         if (isset($payload['optionalInteger'])) {
             $schema->setOptionalInteger($payload['optionalInteger']);
         }

test/suite/functional/Generator/SchemaMapper/item.yaml

@@ -50,6 +50,8 @@ components:
             type: string
         mandatoryObject:
           $ref: '#/components/schemas/EmbeddedObject'
+        mandatoryNullableObject:
+          $ref: '#/components/schemas/EmbeddedNullableObject'
         optionalInteger:
           type: integer
         optionalString:
@@ -83,11 +85,18 @@ components:
         - mandatoryBoolean
         - mandatoryArray
         - mandatoryObject
+        - mandatoryNullableObject
     EmbeddedObject:
       type: object
       properties:
         string:
           type: string
+    EmbeddedNullableObject:
+      type: object
+      nullable: true
+      properties:
+        string:
+          type: string
   parameters:
     ItemId:
       in: path