Fix object as part of a multi type property (fixes #51)

Author: wol-soft

src/PropertyProcessor/Property/MultiTypeProcessor.php

@@ -53,7 +53,7 @@ public function __construct(
         parent::__construct($propertyMetaDataCollection, $schemaProcessor, $schema);
 
         foreach ($types as $type) {
-            $this->propertyProcessors[] = $propertyProcessorFactory->getProcessor(
+            $this->propertyProcessors[$type] = $propertyProcessorFactory->getProcessor(
                 $type,
                 $propertyMetaDataCollection,
                 $schemaProcessor,
@@ -161,7 +161,9 @@ protected function processSubProperties(
             unset($json['default']);
         }
 
-        foreach ($this->propertyProcessors as $propertyProcessor) {
+        foreach ($this->propertyProcessors as $type => $propertyProcessor) {
+            $json['type'] = $type;
+
             $subProperty = $propertyProcessor->process($propertyName, $propertySchema->withJson($json));
             $this->transferValidators($subProperty, $property);
 

src/SchemaProvider/RecursiveDirectoryProvider.php

@@ -9,7 +9,6 @@
 use PHPModelGenerator\Model\SchemaDefinition\JsonSchema;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
-use RecursiveRegexIterator;
 use RegexIterator;
 
 /**

src/Templates/Validator/ComposedItem.phptpl

@@ -80,12 +80,16 @@
                 {% endif %}
 
                 {% if not generatorConfiguration.collectErrors() %}
-                    isset($validatorIndex) ? $this->_propertyValidationState[$validatorIndex][$validatorComponentIndex] = true : null;
+                    if (isset($validatorIndex)) {
+                        $this->_propertyValidationState[$validatorIndex][$validatorComponentIndex] = true;
+                    }
                 {% endif %}
             }
         } catch (\Exception $e) {
             {% if not generatorConfiguration.collectErrors() %}
-                isset($validatorIndex) ? $this->_propertyValidationState[$validatorIndex][$validatorComponentIndex] = false : null;
+                if (isset($validatorIndex)) {
+                    $this->_propertyValidationState[$validatorIndex][$validatorComponentIndex] = false;
+                }
             {% endif %}
 
             {% foreach compositionProperty.getAffectedObjectProperties() as affectedObjectProperty %}

tests/Objects/MultiTypePropertyTest.php

@@ -140,4 +140,76 @@ public function invalidValueDataProvider()
             ]
         ];
     }
+
+    /**
+     * @dataProvider nestedObjectDataProvider
+     */
+    public function testValidNestedObjectInMultiTypePropertyIsValidWithNestedObjectProvided(
+        ?array $propertyValue,
+        ?string $expected
+    ): void {
+        $className = $this->generateClassFromFile('MultiTypeObjectProperty.json');
+
+        $object = new $className(['property' => $propertyValue]);
+
+        if ($propertyValue === null) {
+            $this->assertNull($object->getProperty());
+        } else {
+            $this->assertIsObject($object->getProperty());
+            $this->assertSame($expected, $object->getProperty()->getName());
+        }
+    }
+
+    public function nestedObjectDataProvider(): array
+    {
+        return [
+            'not provided' => [null, null],
+            'empty nested object' => [[], null],
+            'empty string' => [['name' => ''], ''],
+            'name provided' => [['name' => 'Hans'], 'Hans'],
+        ];
+    }
+
+    public function testStringForMultiTypePropertyWithNestedObjectIsValid(): void
+    {
+        $className = $this->generateClassFromFile('MultiTypeObjectProperty.json');
+
+        $object = new $className(['property' => 'Hello']);
+        $this->assertSame('Hello', $object->getProperty());
+    }
+
+    /**
+     * @dataProvider invalidNestedObjectDataProvider
+     */
+    public function testInvalidNestedObjectInMultiTypePropertyThrowsAnException(
+        array $propertyValue,
+        string $exceptionMessage
+    ): void {
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageMatches("/$exceptionMessage/");
+
+        $className = $this->generateClassFromFile('MultiTypeObjectProperty.json');
+
+        new $className(['property' => $propertyValue]);
+    }
+
+    public function invalidNestedObjectDataProvider(): array
+    {
+        return [
+            'invalid type' => [
+                ['name' => 42],
+                <<<ERROR
+Invalid nested object for property property:
+  - Invalid type for name. Requires string, got integer
+ERROR,
+            ],
+            'invalid additional property' => [
+                ['name' => 'Hans', 'age' => 42],
+                <<<ERROR
+Invalid nested object for property property:
+  - Provided JSON for MultiTypePropertyTest_\w+ contains not allowed additional properties \[age\]
+ERROR,
+            ],
+        ];
+    }
 }

tests/Schema/MultiTypePropertyTest/MultiTypeObjectProperty.json

@@ -0,0 +1,15 @@
+{
+  "type": "object",
+  "properties": {
+    "property": {
+      "type": ["string", "object"],
+      "minLength": 4,
+      "properties": {
+        "name": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}