Add recursive array test

Author: wol-soft

src/Model/Property/AbstractProperty.php

@@ -72,11 +72,6 @@ public function onResolve(callable $callback): PropertyInterface
         return $this;
     }
 
-    public function isResolved(): bool
-    {
-        return $this->resolved;
-    }
-
     /**
      * Convert a name of a JSON-field into a valid PHP variable name to be used as class attribute
      *

src/Model/Property/PropertyInterface.php

@@ -210,9 +210,4 @@ public function getJsonSchema(): JsonSchema;
      * Adds a callback which will be executed after the property is set up completely
      */
     public function onResolve(callable $callback): PropertyInterface;
-
-    /**
-     * Check if the property set up is finished
-     */
-    public function isResolved(): bool;
 }

tests/Objects/ArrayPropertyTest.php

@@ -2,6 +2,8 @@
 
 namespace PHPModelGenerator\Tests\Objects;
 
+use PHPModelGenerator\Exception\Arrays\InvalidItemException;
+use PHPModelGenerator\Exception\Arrays\MinItemsException;
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\RenderException;
 use PHPModelGenerator\Exception\SchemaException;
@@ -867,6 +869,7 @@ public function invalidObjectArrayDataProvider(): array
             )
         );
     }
+
     public function invalidCombinedObjectArrayDataProvider(): array
     {
         return $this->combineDataProvider(
@@ -951,4 +954,49 @@ public function invalidCombinedObjectArrayDataProvider(): array
             )
         );
     }
+
+    /**
+     * @dataProvider validRecursiveArrayDataProvider
+     */
+    public function testValidRecursiveArray(array $input): void
+    {
+        $className = $this->generateClassFromFile('RecursiveArray.json');
+
+        $object = new $className(['property' => $input]);
+
+        $this->assertSame($input, $object->getProperty());
+    }
+
+    public function validRecursiveArrayDataProvider(): array
+    {
+        return [
+            'only string' => [['Hello']],
+            'only nested array' => [[['Hello']]],
+            'string and nested array' => [[['Hello'], 'World']],
+            'two level nested array' => [[[['Hello'], 'World'], '!']],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidRecursiveArrayDataProvider
+     */
+    public function testInvalidRecursiveArrayThrowsAnException(string $expectedException, array $input): void
+    {
+        $this->expectException($expectedException);
+
+        $className = $this->generateClassFromFile('RecursiveArray.json');
+
+        new $className(['property' => $input]);
+    }
+
+    public function invalidRecursiveArrayDataProvider(): array
+    {
+        return [
+            'empty array' => [MinItemsException::class, []],
+            'empty nested array' => [InvalidItemException::class, [[]]],
+            'string with empty nested array' => [InvalidItemException::class, ['Hello', []]],
+            'invalid type' => [InvalidItemException::class, [2]],
+            'invalid nested type' => [InvalidItemException::class, ['Hello', [2]]],
+        ];
+    }
 }

tests/Schema/ArrayPropertyTest/RecursiveArray.json

@@ -0,0 +1,24 @@
+{
+  "definitions": {
+    "list": {
+      "type": "array",
+      "items": {
+        "oneOf": [
+          {
+            "$ref": "#/definitions/list"
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "minItems": 1
+    }
+  },
+  "type": "object",
+  "properties": {
+    "property": {
+      "$ref": "#/definitions/list"
+    }
+  }
+}