add writeOnly/readOnly keywords, nullable keyword

src/Schema/Keywords/AdditionalProperties.php

@@ -9,7 +9,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 
-class AdditionalProperties
+class AdditionalProperties extends BaseKeyword
 {
     public function validate($data, bool $additionalProperties): void
     {

src/Schema/Keywords/AllOf.php

@@ -14,7 +14,7 @@
 use OpenAPIValidation\Schema\Validator as SchemaValidator;
 use Respect\Validation\Validator;
 
-class AllOf
+class AllOf extends BaseKeyword
 {
     /**
      * This keyword's value MUST be an array.  This array MUST have at least

src/Schema/Keywords/AnyOf.php

@@ -14,7 +14,7 @@
 use OpenAPIValidation\Schema\Validator as SchemaValidator;
 use Respect\Validation\Validator;
 
-class AnyOf
+class AnyOf extends BaseKeyword
 {
     /**
      * This keyword's value MUST be an array.  This array MUST have at least

src/Schema/Keywords/BaseKeyword.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * @author Dmitry Lezhnev <[email protected]>
+ * Date: 01 May 2019
+ */
+declare(strict_types=1);
+
+
+namespace OpenAPIValidation\Schema\Keywords;
+
+
+use cebe\openapi\spec\Schema as CebeSchema;
+use OpenAPIValidation\Schema\Validator;
+
+abstract class BaseKeyword
+{
+    /** @var CebeSchema */
+    protected $parentSchema;
+    /** @var Validator */
+    protected $parentSchemaValidator;
+
+    /**
+     * @param CebeSchema $parentSchema
+     * @param Validator $parentSchemaValidator
+     */
+    public function __construct(CebeSchema $parentSchema, Validator $parentSchemaValidator)
+    {
+        $this->parentSchema          = $parentSchema;
+        $this->parentSchemaValidator = $parentSchemaValidator;
+    }
+
+
+}

src/Schema/Keywords/Descriminator.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * @author Dmitry Lezhnev <[email protected]>
+ * Date: 01 May 2019
+ */
+declare(strict_types=1);
+
+
+namespace OpenAPIValidation\Schema\Keywords;
+
+
+use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use Respect\Validation\Validator;
+
+class Descriminator extends BaseKeyword
+{
+    /**
+     * The value of this keyword MUST be an array.  This array SHOULD have
+     * at least one element.  Elements in the array SHOULD be unique.
+     *
+     * Elements in the array MAY be of any type, including null.
+     *
+     * An instance validates successfully against this keyword if its value
+     * is equal to one of the elements in this keyword's array value.
+     *
+     * @param $data
+     * @param array $enum
+     */
+    public function validate($data, array $enum): void
+    {
+        try {
+            Validator::arrayType()->assert($enum);
+            Validator::trueVal()->assert(count($enum) >= 1);
+
+            if (!in_array($data, $enum, true)) {
+                throw new \Exception(sprintf("Value must be present in the enum"));
+            }
+
+        } catch (\Throwable $e) {
+            throw ValidationKeywordFailed::fromKeyword("enum", $data, $e->getMessage());
+        }
+    }
+}

src/Schema/Keywords/Enum.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Enum
+class Enum extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an array.  This array SHOULD have

src/Schema/Keywords/Items.php

@@ -14,20 +14,8 @@
 use OpenAPIValidation\Schema\Validator as SchemaValidator;
 use Respect\Validation\Validator;
 
-class Items
+class Items extends BaseKeyword
 {
-    /** @var CebeSchema */
-    protected $parentSchema;
-
-    /**
-     * @param CebeSchema $parentSchema
-     */
-    public function __construct(CebeSchema $parentSchema)
-    {
-        $this->parentSchema = $parentSchema;
-    }
-
-
     /**
      * Value MUST be an object and not an array.
      * Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.

src/Schema/Keywords/MaxItems.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MaxItems
+class MaxItems extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an integer.  This integer MUST be

src/Schema/Keywords/MaxLength.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MaxLength
+class MaxLength extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be a non-negative integer.

src/Schema/Keywords/MaxProperties.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MaxProperties
+class MaxProperties extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an integer.  This integer MUST be

src/Schema/Keywords/Maximum.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Maximum
+class Maximum extends BaseKeyword
 {
     /**
      * The value of "maximum" MUST be a number, representing an upper limit

src/Schema/Keywords/MinItems.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MinItems
+class MinItems extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an integer.  This integer MUST be

src/Schema/Keywords/MinLength.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MinLength
+class MinLength extends BaseKeyword
 {
     /**
      * A string instance is valid against this keyword if its length is

src/Schema/Keywords/MinProperties.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MinProperties
+class MinProperties extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an integer.  This integer MUST be

src/Schema/Keywords/Minimum.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Minimum
+class Minimum extends BaseKeyword
 {
     /**
      * The value of "minimum" MUST be a number, representing a lower limit

src/Schema/Keywords/MultipleOf.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class MultipleOf
+class MultipleOf extends BaseKeyword
 {
     /**
      * The value of "multipleOf" MUST be a number, strictly greater than 0.

src/Schema/Keywords/Not.php

@@ -14,7 +14,7 @@
 use OpenAPIValidation\Schema\Validator as SchemaValidator;
 use Respect\Validation\Validator;
 
-class Not
+class Not extends BaseKeyword
 {
     /**
      * This keyword's value MUST be an object.

src/Schema/Keywords/Nullable.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * @author Dmitry Lezhnev <[email protected]>
+ * Date: 01 May 2019
+ */
+declare(strict_types=1);
+
+
+namespace OpenAPIValidation\Schema\Keywords;
+
+
+use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+
+class Nullable extends BaseKeyword
+{
+    /**
+     * Allows sending a null value for the defined schema. Default value is false.
+     *
+     * @param $data
+     * @param bool $nullable
+     */
+    public function validate($data, bool $nullable): void
+    {
+        try {
+            if (!$nullable && ($data === null)) {
+                throw new \Exception("Value cannot be null");
+            }
+
+
+        } catch (\Throwable $e) {
+            throw ValidationKeywordFailed::fromKeyword("nullable", $data, $e->getMessage());
+        }
+    }
+}

src/Schema/Keywords/OneOf.php

@@ -14,7 +14,7 @@
 use OpenAPIValidation\Schema\Validator as SchemaValidator;
 use Respect\Validation\Validator;
 
-class OneOf
+class OneOf extends BaseKeyword
 {
     /**
      * This keyword's value MUST be an array.  This array MUST have at least

src/Schema/Keywords/Pattern.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Pattern
+class Pattern extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be a string.  This string SHOULD be a

src/Schema/Keywords/Properties.php

@@ -14,20 +14,8 @@
 use Respect\Validation\Validator;
 
 
-class Properties
+class Properties extends BaseKeyword
 {
-    /** @var CebeSchema */
-    protected $parentSchema;
-
-    /**
-     * @param CebeSchema $parentSchema
-     */
-    public function __construct(CebeSchema $parentSchema)
-    {
-        $this->parentSchema = $parentSchema;
-    }
-
-
     /**
      * Property definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced).
      * If absent, it can be considered the same as an empty object.
@@ -71,7 +59,7 @@ public function validate($data, $properties, $additionalProperties): void
             // Validate against "properties"
             foreach ($properties as $propName => $propSchema) {
                 if (property_exists($data, $propName)) {
-                    $schemaValidator = new SchemaValidator($propSchema, $data->$propName);
+                    $schemaValidator = new SchemaValidator($propSchema, $data->$propName, $this->parentSchemaValidator->dataType());
                     $schemaValidator->validate();
                 }
             }
@@ -80,7 +68,7 @@ public function validate($data, $properties, $additionalProperties): void
             if ($additionalProperties instanceof CebeSchema) {
                 foreach ($data as $propName => $propSchema) {
                     if (!isset($properties[$propName])) { # if not covered by "properties"
-                        $schemaValidator = new SchemaValidator($additionalProperties, $data->$propName);
+                        $schemaValidator = new SchemaValidator($additionalProperties, $data->$propName, $this->parentSchemaValidator->dataType());
                         $schemaValidator->validate();
                     }
                 }

src/Schema/Keywords/Required.php

@@ -12,7 +12,7 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Required
+class Required extends BaseKeyword
 {
     /**
      * The value of this keyword MUST be an array.  This array MUST have at
@@ -33,13 +33,33 @@ public function validate($data, $required): void
             Validator::each(Validator::stringType())->assert($required);
             Validator::trueVal()->assert(count(array_unique($required)) === count($required));
 
+            if ($this->parentSchema->type !== "object") {
+                throw new \Exception(sprintf("Required keyword only works with type=object, but %s found", $this->parentSchema->type));
+            }
+
             foreach ($required as $reqProperty) {
                 $propertyFound = false;
                 foreach ($data as $property => $value) {
                     $propertyFound = $propertyFound || ($reqProperty === $property);
                 }
 
                 if (!$propertyFound) {
+
+                    # respect writeOnly/readOnly keywords
+                    if (
+                        (
+                            $this->parentSchema->properties[$reqProperty]->writeOnly &&
+                            $this->parentSchemaValidator->dataType() == \OpenAPIValidation\Schema\Validator::VALIDATE_AS_RESPONSE
+                        )
+                        ||
+                        (
+                            $this->parentSchema->properties[$reqProperty]->readOnly &&
+                            $this->parentSchemaValidator->dataType() == \OpenAPIValidation\Schema\Validator::VALIDATE_AS_REQUEST
+                        )
+                    ) {
+                        continue;
+                    }
+
                     throw new \Exception(sprintf("Required property %s must be present in the object", $reqProperty));
                 }
             }

src/Schema/Keywords/Type.php

@@ -13,19 +13,8 @@
 use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use Respect\Validation\Validator;
 
-class Type
+class Type extends BaseKeyword
 {
-    /** @var CebeSchema */
-    protected $parentSchema;
-
-    /**
-     * @param CebeSchema $parentSchema
-     */
-    public function __construct(CebeSchema $parentSchema)
-    {
-        $this->parentSchema = $parentSchema;
-    }
-
     /**
      * The value of this keyword MUST be either a string ONLY.
      *
@@ -52,6 +41,10 @@ public function validate($data, $type, $format = null): void
                 # Note that there is no null type; instead, the nullable attribute is used as a modifier of the base type.
             ])->stringType()->assert($type);
 
+            if ($this->parentSchema->nullable && $data === null) {
+                return;
+            }
+
             switch ($type) {
                 case "boolean":
                     if (!is_bool($data)) {