Add recursive multi type tests

Author: wol-soft

src/PropertyProcessor/Property/MultiTypeProcessor.php

@@ -85,29 +85,36 @@ public function process(string $propertyName, JsonSchema $propertySchema): Prope
 
             $subProperties = $this->processSubProperties($propertyName, $propertySchema, $property);
 
-            if (empty($this->allowedPropertyTypes)) {
-                return;
+            $processedSubProperties = 0;
+            foreach ($subProperties as $subProperty) {
+                $subProperty->onResolve(function () use ($property, $subProperties, &$processedSubProperties) {
+                    if (++$processedSubProperties === count($subProperties)) {
+                        if (empty($this->allowedPropertyTypes)) {
+                            return;
+                        }
+
+                        $property->addTypeHintDecorator(
+                            new TypeHintDecorator(
+                                array_map(
+                                    static function (PropertyInterface $subProperty): string {
+                                        return $subProperty->getTypeHint();
+                                    },
+                                    $subProperties
+                                )
+                            )
+                        );
+
+                        $property->addValidator(
+                            new MultiTypeCheckValidator(
+                                array_unique($this->allowedPropertyTypes),
+                                $property,
+                                $this->isImplicitNullAllowed($property)
+                            ),
+                            2
+                        );
+                    }
+                });
             }
-
-            $property->addTypeHintDecorator(
-                new TypeHintDecorator(
-                    array_map(
-                        static function (PropertyInterface $subProperty): string {
-                            return $subProperty->getTypeHint();
-                        },
-                        $subProperties
-                    )
-                )
-            );
-
-            $property->addValidator(
-                new MultiTypeCheckValidator(
-                    array_unique($this->allowedPropertyTypes),
-                    $property,
-                    $this->isImplicitNullAllowed($property)
-                ),
-                2
-            );
         });
 
         return $property;

tests/Objects/MultiTypePropertyTest.php

@@ -2,7 +2,10 @@
 
 namespace PHPModelGenerator\Tests\Objects;
 
+use PHPModelGenerator\Exception\Arrays\InvalidItemException;
+use PHPModelGenerator\Exception\Arrays\MinItemsException;
 use PHPModelGenerator\Exception\FileSystemException;
+use PHPModelGenerator\Exception\Generic\InvalidTypeException;
 use PHPModelGenerator\Exception\RenderException;
 use PHPModelGenerator\Exception\SchemaException;
 use PHPModelGenerator\Model\GeneratorConfiguration;
@@ -229,8 +232,66 @@ public function validRecursiveMultiTypeDataProvider(): array
     {
         return [
             'string'       => ['Test'],
-           # 'array'        => [['Test1', 'Test2']],
-           # 'nested array' => [[['Test1', 'Test2'], 'Test3']],
+            'array'        => [['Test1', 'Test2']],
+            'nested array' => [[['Test1', 'Test2'], 'Test3']],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidRecursiveMultiTypeDataProvider
+     */
+    public function testInvalidRecursiveMultiType($input, string $expectedException, string $exceptionMessage): void
+    {
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($exceptionMessage);
+
+        $className = $this->generateClassFromFile('RecursiveMultiTypeProperty.json');
+
+        new $className(['property' => $input]);
+    }
+
+    public function invalidRecursiveMultiTypeDataProvider(): array
+    {
+        return [
+            'int' => [
+                1,
+                InvalidTypeException::class,
+                'Invalid type for property. Requires [string, array], got integer',
+            ],
+            'invalid item in array' => [
+                ['Test1', 1],
+                InvalidItemException::class,
+                <<<ERROR
+Invalid items in array item of array property:
+  - invalid item #1
+    * Invalid type for item of array property. Requires [string, array], got integer
+ERROR
+            ],
+            'invalid array length' => [
+                [],
+                MinItemsException::class,
+                'Array property must not contain less than 2 items',
+            ],
+            'invalid item in nested array' => [
+                ['Test1', [3, 'Test3']],
+                InvalidItemException::class,
+                <<<ERROR
+Invalid items in array item of array property:
+  - invalid item #1
+    * Invalid items in array item of array property:
+      - invalid item #0
+        * Invalid type for item of array property. Requires [string, array], got integer
+ERROR
+            ],
+            'invalid array length in nested array' => [
+                ['Test1', []],
+                InvalidItemException::class,
+                <<<ERROR
+Invalid items in array item of array property:
+  - invalid item #1
+    * Array item of array property must not contain less than 2 items
+ERROR
+            ],
         ];
     }
 }