Remove unused code, add recursive tuple test

Author: wol-soft

src/Model/Property/Property.php

@@ -153,14 +153,6 @@ public function addTypeHintDecorator(TypeHintDecoratorInterface $typeHintDecorat
         return $this;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function getTypeHintDecorators(): array
-    {
-        return $this->typeHintDecorators;
-    }
-
     /**
      * @inheritdoc
      */

src/Model/Property/PropertyInterface.php

@@ -63,7 +63,6 @@ public function getTypeHint(bool $outputType = false, array $skipDecorators = []
      */
     public function addTypeHintDecorator(TypeHintDecoratorInterface $typeHintDecorator): PropertyInterface;
 
-    public function getTypeHintDecorators(): array;
     /**
      * Get a description for the property. If no description is available an empty string will be returned
      *

src/Model/Property/PropertyProxy.php

@@ -89,13 +89,6 @@ public function addTypeHintDecorator(TypeHintDecoratorInterface $typeHintDecorat
     {
         return $this->getProperty()->addTypeHintDecorator($typeHintDecorator);
     }
-    /**
-     * @inheritdoc
-     */
-    public function getTypeHintDecorators(): array
-    {
-        return $this->getProperty()->getTypeHintDecorators();
-    }
 
     /**
      * @inheritdoc
@@ -257,11 +250,4 @@ public function isInternal(): bool
     {
         return $this->getProperty()->isInternal();
     }
-
-    public function __clone()
-    {
-        $cloneKey = $this->key . uniqid();
-        $this->definitionsCollection->offsetSet($cloneKey, clone $this->definitionsCollection->offsetGet($this->key));
-        $this->key = $cloneKey;
-    }
 }

src/Model/Validator/ArrayTupleValidator.php

@@ -46,7 +46,6 @@ public function __construct(
 
         $this->tupleProperties = [];
 
-        $pendingTuples = 0;
         foreach ($propertiesStructure->getJson() as $tupleIndex => $tupleItem) {
             $tupleItemName = "tuple item #$tupleIndex of array $propertyName";
 
@@ -59,21 +58,10 @@ public function __construct(
                 $propertiesStructure->withJson($tupleItem)
             );
 
-            if (!$tupleProperty->isResolved()) {
-                $pendingTuples++;
-                $tupleProperty->onResolve(function () use (&$pendingTuples): void {
-                    if (--$pendingTuples === 0) {
-                        $this->resolve();
-                    }
-                });
-            }
-
             $this->tupleProperties[] = $tupleProperty;
         }
 
-        if ($pendingTuples === 0) {
-            $this->resolve();
-        }
+        $this->resolve();
 
         parent::__construct(
             new Property($propertyName, null, $propertiesStructure),

tests/AbstractPHPModelGeneratorTest.php

@@ -417,7 +417,8 @@ protected function assertErrorRegistryContainsException(
         $this->fail("Error exception $expectedException not found in error registry exception");
     }
 
-    public function validationMethodDataProvider(): array {
+    public function validationMethodDataProvider(): array
+    {
         return [
             'Error Collection' => [new GeneratorConfiguration()],
             'Direct Exception' => [(new GeneratorConfiguration())->setCollectErrors(false)],

tests/Basic/IdenticalNestedSchemaTest.php

@@ -97,7 +97,7 @@ public function testIdenticalReferencedSchemaInMultipleFilesAreMappedToOneClass(
         $this->assertSame(get_class($object1->getMember()), get_class($object2->getMember()));
     }
 
-    public function identicalReferencedSchemaDataProvider()
+    public function identicalReferencedSchemaDataProvider(): array
     {
         return [
             'In same namespace' => [

tests/Objects/MultiTypePropertyTest.php

@@ -120,7 +120,7 @@ public function testInvalidProvidedValueThrowsAnException($propertyValue, string
         new $className(['property' => $propertyValue]);
     }
 
-    public function invalidValueDataProvider()
+    public function invalidValueDataProvider(): array
     {
         return [
             'Bool' => [true, 'Invalid type for property. Requires [float, string, array], got boolean'],

tests/Objects/TupleArrayPropertyTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPModelGenerator\Tests\Objects;
 
+use PHPModelGenerator\Exception\Arrays\InvalidTupleException;
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\RenderException;
 use PHPModelGenerator\Exception\SchemaException;
@@ -418,4 +419,48 @@ public function invalidObjectAdditionalItemsDataProvider(): array
             ]
         );
     }
+
+    /**
+     * @dataProvider validRecursiveTupleDataProvider
+     */
+    public function testValidRecursiveTuple(array $input): void
+    {
+        $className = $this->generateClassFromFile('RecursiveTupleArray.json');
+
+        $object = new $className(['property' => $input]);
+
+        $this->assertSame($input, $object->getProperty());
+    }
+
+    public function validRecursiveTupleDataProvider(): array
+    {
+        return [
+            'string' => [['abc', 'def']],
+            'one level nested' => [['abc', ['abc', 'def']]],
+            'two level nested' => [['abc', ['abc', ['abc', 'def']]]],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidRecursiveTupleDataProvider
+     */
+    public function testInvalidRecursiveTuple(array $input): void
+    {
+        $this->expectException(InvalidTupleException::class);
+
+        $className = $this->generateClassFromFile('RecursiveTupleArray.json');
+
+        new $className(['property' => $input]);
+    }
+
+    public function invalidRecursiveTupleDataProvider(): array
+    {
+        return [
+            'invalid first tuple' => [[1, 'def']],
+            'invalid second tuple' => [['abc', 1]],
+            'one level nested - invalid first tuple' => [[1, ['abc', 'def']]],
+            'one level nested - invalid nested first tuple' => [['abc', [1, 'def']]],
+            'one level nested - invalid nested second tuple' => [['abc', ['abc', 1]]],
+        ];
+    }
 }

tests/Schema/TupleArrayPropertyTest/RecursiveTupleArray.json

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