feat: more support for draft-06

Author: DannyvdSluijs

src/JsonSchema/Constraints/Drafts/Draft06/AdditionalItemsConstraint.php

@@ -14,9 +14,13 @@ class AdditionalItemsConstraint implements ConstraintInterface
 {
     use ErrorBagProxy;
 
+    /** @var \JsonSchema\Constraints\Drafts\Draft06\Factory */
+    private $factory;
+
     public function __construct(?Factory $factory = null)
     {
-        $this->initialiseErrorBag($factory ?: new Factory());
+        $this->factory = $factory ?: new Factory();
+        $this->initialiseErrorBag($this->factory);
     }
 
     public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
@@ -28,16 +32,31 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
         if ($schema->additionalItems === true) {
             return;
         }
+        if ($schema->additionalItems === false && ! property_exists($schema, 'items')) {
+            return;
+        }
 
         if (!is_array($value)) {
             return;
         }
+        if (!property_exists($schema, 'items')) {
+            return;
+        }
+        if (property_exists($schema, 'items') && is_object($schema->items)) {
+            return;
+        }
+
+        $additionalItems = array_diff_key($value, property_exists($schema, 'items') ? $schema->items : []);
 
+        foreach ($additionalItems as $propertyName => $propertyValue) {
+            $schemaConstraint = $this->factory->createInstanceFor('schema');
+            $schemaConstraint->check($propertyValue, $schema->additionalItems, $path, $i);
 
-        $additionalItems = array_diff_key($value, $schema->items);
+            if ($schemaConstraint->isValid()) {
+                continue;
+            }
 
-        foreach ($additionalItems as $key => $_) {
-            $this->addError(ConstraintError::ADDITIONAL_ITEMS(), $path, ['item' => $i, 'property' => $key, 'additionalItems' => $schema->additionalItems]);
+            $this->addError(ConstraintError::ADDITIONAL_ITEMS(), $path, ['item' => $i, 'property' => $propertyName, 'additionalItems' => $schema->additionalItems]);
         }