Add unevaluatedProperties and unevaluatedItems (#7)

Author: luca-rath

src/Keyword/UnevaluatedItemsKeyword.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JsonSchema\Keyword;
+
+use JsonSchema\Schema\SchemaInterface;
+use Webmozart\Assert\Assert;
+
+class UnevaluatedItemsKeyword extends AbstractKeyword
+{
+    const NAME = 'unevaluatedItems';
+
+    /**
+     * @param bool|SchemaInterface|null $unevaluatedItems
+     */
+    public function __construct($unevaluatedItems)
+    {
+        if (null === $unevaluatedItems || \is_bool($unevaluatedItems)) {
+            parent::__construct(static::NAME, $unevaluatedItems);
+
+            return;
+        }
+
+        Assert::isInstanceOf($unevaluatedItems, SchemaInterface::class);
+
+        parent::__construct(static::NAME, $unevaluatedItems->toJsonSchema());
+    }
+}

src/Keyword/UnevaluatedPropertiesKeyword.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JsonSchema\Keyword;
+
+use JsonSchema\Schema\SchemaInterface;
+use Webmozart\Assert\Assert;
+
+class UnevaluatedPropertiesKeyword extends AbstractKeyword
+{
+    const NAME = 'unevaluatedProperties';
+
+    /**
+     * @param bool|SchemaInterface|null $unevaluatedProperties
+     */
+    public function __construct($unevaluatedProperties)
+    {
+        if (null === $unevaluatedProperties || \is_bool($unevaluatedProperties)) {
+            parent::__construct(static::NAME, $unevaluatedProperties);
+
+            return;
+        }
+
+        Assert::isInstanceOf($unevaluatedProperties, SchemaInterface::class);
+
+        parent::__construct(static::NAME, $unevaluatedProperties->toJsonSchema());
+    }
+}

src/Schema/ArraySchema.php

@@ -10,6 +10,7 @@
 use JsonSchema\Keyword\MinContainsKeyword;
 use JsonSchema\Keyword\MinItemsKeyword;
 use JsonSchema\Keyword\TypeKeyword;
+use JsonSchema\Keyword\UnevaluatedItemsKeyword;
 use JsonSchema\Keyword\UniqueItemsKeyword;
 
 class ArraySchema extends AbstractSchema
@@ -71,6 +72,18 @@ public function additionalItems($additionalItems): self
         );
     }
 
+    /**
+     * @param bool|SchemaInterface|null $unevaluatedItems
+     *
+     * @return static
+     */
+    public function unevaluatedItems($unevaluatedItems): self
+    {
+        return $this->with(
+            new UnevaluatedItemsKeyword($unevaluatedItems)
+        );
+    }
+
     /**
      * @return static
      */

src/Schema/ObjectSchema.php

@@ -11,6 +11,7 @@
 use JsonSchema\Keyword\PropertyNamesKeyword;
 use JsonSchema\Keyword\RequiredKeyword;
 use JsonSchema\Keyword\TypeKeyword;
+use JsonSchema\Keyword\UnevaluatedPropertiesKeyword;
 use JsonSchema\Property\PropertyInterface;
 
 class ObjectSchema extends AbstractSchema
@@ -64,6 +65,18 @@ public function additionalProperties($additionalProperties): self
         );
     }
 
+    /**
+     * @param bool|SchemaInterface|null $unevaluatedProperties
+     *
+     * @return static
+     */
+    public function unevaluatedProperties($unevaluatedProperties): self
+    {
+        return $this->with(
+            new UnevaluatedPropertiesKeyword($unevaluatedProperties)
+        );
+    }
+
     /**
      * @return static
      */

tests/Unit/Schema/ArraySchemaTest.php

@@ -92,6 +92,24 @@ public function testAdditionalItems(): void
         static::assertEquals((object) ['type' => 'array'], $schema5->toJsonSchema());
     }
 
+    public function testUnevaluatedItems(): void
+    {
+        $unevaluatedItemsJsonSchema = (object) ['foo' => 'bar'];
+        $unevaluatedItemsSchema = $this->mockSchema($unevaluatedItemsJsonSchema);
+
+        $schema1 = new ArraySchema();
+        $schema2 = $schema1->unevaluatedItems($unevaluatedItemsSchema->reveal());
+        $schema3 = $schema2->unevaluatedItems(true);
+        $schema4 = $schema3->unevaluatedItems(false);
+        $schema5 = $schema4->unevaluatedItems(null);
+
+        static::assertEquals((object) ['type' => 'array'], $schema1->toJsonSchema());
+        static::assertEquals((object) ['type' => 'array', 'unevaluatedItems' => $unevaluatedItemsJsonSchema], $schema2->toJsonSchema());
+        static::assertEquals((object) ['type' => 'array', 'unevaluatedItems' => true], $schema3->toJsonSchema());
+        static::assertEquals((object) ['type' => 'array', 'unevaluatedItems' => false], $schema4->toJsonSchema());
+        static::assertEquals((object) ['type' => 'array'], $schema5->toJsonSchema());
+    }
+
     public function testMinItems(): void
     {
         $schema1 = new ArraySchema();

tests/Unit/Schema/ObjectSchemaTest.php

@@ -164,6 +164,24 @@ public function testAdditionalProperties(): void
         static::assertEquals((object) ['type' => 'object'], $schema5->toJsonSchema());
     }
 
+    public function testUnevaluatedProperties(): void
+    {
+        $unevaluatedPropertiesJsonSchema = (object) ['foo' => 'bar'];
+        $unevaluatedPropertiesSchema = $this->mockSchema($unevaluatedPropertiesJsonSchema);
+
+        $schema1 = new ObjectSchema();
+        $schema2 = $schema1->unevaluatedProperties($unevaluatedPropertiesSchema->reveal());
+        $schema3 = $schema2->unevaluatedProperties(true);
+        $schema4 = $schema3->unevaluatedProperties(false);
+        $schema5 = $schema4->unevaluatedProperties(null);
+
+        static::assertEquals((object) ['type' => 'object'], $schema1->toJsonSchema());
+        static::assertEquals((object) ['type' => 'object', 'unevaluatedProperties' => $unevaluatedPropertiesJsonSchema], $schema2->toJsonSchema());
+        static::assertEquals((object) ['type' => 'object', 'unevaluatedProperties' => true], $schema3->toJsonSchema());
+        static::assertEquals((object) ['type' => 'object', 'unevaluatedProperties' => false], $schema4->toJsonSchema());
+        static::assertEquals((object) ['type' => 'object'], $schema5->toJsonSchema());
+    }
+
     public function testMinProperties(): void
     {
         $schema1 = new ObjectSchema();