Fix incomplete tuple validation

Author: Enno Woortmann

docs/source/complexTypes/array.rst

@@ -146,10 +146,6 @@ Items
         }
     }
 
-Possible exceptions:
-
-* Missing tuple item in array example. Requires 2 items, got 1
-
 If invalid tuples are provided a detailed exception will be thrown containing all violations:
 
 .. code-block:: none
@@ -160,6 +156,10 @@ If invalid tuples are provided a detailed exception will be thrown containing al
       - invalid tuple #1
         * Invalid type for name. Requires string, got boolean
 
+.. hint::
+
+    Incomplete tuples are valid. Consequently an empty array provided for the schema shown above would pass the validation. Keep this in mind when designing tuple constraints. To force the given data to provide all tuples use tuple items combined with the `minItems` array size validation.
+
 Additional items
 ^^^^^^^^^^^^^^^^
 

src/PropertyProcessor/Property/ArrayProcessor.php

@@ -154,27 +154,14 @@ private function addTupleValidator(PropertyInterface $property, array $propertyD
             $this->addAdditionalItemsValidator($property, $propertyData);
         }
 
-        $tupleCount = count($propertyData[self::JSON_FIELD_ITEMS]);
-
-        $property
-            ->addValidator(
-                new PropertyValidator(
-                    'is_array($value) && ($amount = count($value)) < ' . $tupleCount,
-                    sprintf(
-                        'Missing tuple item in array %s. Requires %s items, got $amount',
-                        $property->getName(),
-                        $tupleCount
-                    )
-                )
+        $property->addValidator(
+            new ArrayTupleValidator(
+                $this->schemaProcessor,
+                $this->schema,
+                $propertyData[self::JSON_FIELD_ITEMS],
+                $property->getName()
             )
-            ->addValidator(
-                new ArrayTupleValidator(
-                    $this->schemaProcessor,
-                    $this->schema,
-                    $propertyData[self::JSON_FIELD_ITEMS],
-                    $property->getName()
-                )
-            );
+        );
     }
 
     /**

src/Templates/Validator/ArrayTuple.phptpl

@@ -7,6 +7,10 @@ is_array($value) && (function (&$items) use (&$invalidTuples) {
     {% foreach tupleProperties as tuple %}
         // ---------------- validate a single tuple of the array ------------------
         try {
+            if ($index === count($items)) {
+                return !empty($invalidTuples);
+            }
+
             {% if generatorConfiguration.collectErrors() %}
                 $this->errorRegistry = new {{ viewHelper.getSimpleClassName(generatorConfiguration.getErrorRegistryClass()) }}();
             {% endif %}

tests/Objects/TupleArrayPropertyTest.php

@@ -17,6 +17,7 @@
 class TupleArrayPropertyTest extends AbstractPHPModelGeneratorTest
 {
     /**
+     * @dataProvider validIncompleteTupleArrayDataProvider
      * @dataProvider validTupleArrayDataProvider
      * @dataProvider validTupleArrayWithAdditionalPropertiesDataProvider
      *
@@ -29,11 +30,33 @@ public function testValidValuesForTupleArray(GeneratorConfiguration $configurati
 
         $object = new $className(['property' => $propertyValue]);
 
-        $this->assertSame($propertyValue[0], $object->getProperty()[0]);
-        $this->assertSame($propertyValue[1], $object->getProperty()[1]);
-        $this->assertSame($propertyValue[2]['name'], $object->getProperty()[2]->getName());
-        $this->assertSame($propertyValue[2]['age'] ?? null, $object->getProperty()[2]->getAge());
-        $this->assertSame($propertyValue[2], $object->getProperty()[2]->getRawModelDataInput());
+        if (count($propertyValue) > 0) {
+            $this->assertSame($propertyValue[0], $object->getProperty()[0]);
+        } else {
+            $this->assertSame([], $object->getProperty());
+        }
+
+        if (count($propertyValue) > 1) {
+            $this->assertSame($propertyValue[1], $object->getProperty()[1]);
+        }
+
+        if (count($propertyValue) > 2) {
+            $this->assertSame($propertyValue[2]['name'], $object->getProperty()[2]->getName());
+            $this->assertSame($propertyValue[2]['age'] ?? null, $object->getProperty()[2]->getAge());
+            $this->assertSame($propertyValue[2], $object->getProperty()[2]->getRawModelDataInput());
+        }
+    }
+
+    public function validIncompleteTupleArrayDataProvider(): array
+    {
+        return $this->combineDataProvider(
+            $this->validationMethodDataProvider(),
+            [
+                'empty array' => [[]],
+                'only one value' => [[4]],
+                'multiple values' => [[100, 'Avenue']],
+            ]
+        );
     }
 
     public function validTupleArrayDataProvider(): array
@@ -104,9 +127,13 @@ public function invalidTupleArrayDataProvider(): array
         return $this->combineDataProvider(
             $this->validationMethodDataProvider(),
             [
-                'empty array' => [
-                    [],
-                    'Missing tuple item in array property. Requires 3 items, got 0'
+                'not all elements invalid type' => [
+                    [400, ''],
+                    <<<ERROR
+Invalid tuple item in array property:
+  - invalid tuple #2
+    * Invalid value for tuple item #1 of array property declined by enum constraint
+ERROR
                 ],
                 'invalid type' => [
                     ['400', 'Avenue', ['name' => 'Hans', 'age' => 42]],