Throw on invalid schemas

.travis.yml

@@ -25,4 +25,4 @@ script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' && $TRAVIS_PHP_VERSION != '7.1' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi

CHANGELOG.md

@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     * Any calls to `ValidationError@getCode` need to be changed to `ValidationError@getKeyword`.
     * If you are using the `ArrayAccess` interface for `ValidationError` you need to replace any usage of the `code` key with `keyword`.
     * Instead of there being a different code for every format failure, they just return the keyword 'format'.
+* Invalid schemas now throw an InvalidSchemaException.
 
 ### Fixed
 

src/Assert.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace League\JsonGuard;
+
+use League\JsonGuard\Exceptions\InvalidSchemaException;
+
+/**
+ * Assertions to verify a schema is valid.
+ */
+class Assert
+{
+    /**
+     * Validate an array has at least one element.
+     *
+     * @param array       $value
+     * @param string      $keyword
+     * @param string|null $pointer
+     */
+    public static function notEmpty(array $value, $keyword, $pointer = null)
+    {
+        if (!empty($value)) {
+            return;
+        }
+
+        throw InvalidSchemaException::emptyArray($keyword, $pointer);
+    }
+
+    /**
+     * Validate an integer is non-negative.
+     *
+     * @param integer     $value
+     * @param string      $keyword
+     * @param string|null $pointer
+     */
+    public static function nonNegative($value, $keyword, $pointer = null)
+    {
+        if ($value >= 0) {
+            return;
+        }
+
+        throw InvalidSchemaException::negativeValue(
+            $value,
+            $keyword,
+            $pointer
+        );
+    }
+
+    /**
+     * Validate a value is one of the allowed types.
+     *
+     * @param mixed        $value
+     * @param array|string $choices
+     * @param string       $keyword
+     * @param string|null  $pointer
+     *
+     * @throws InvalidSchemaException
+     */
+    public static function type($value, $choices, $keyword, $pointer = null)
+    {
+        $actualType = gettype($value);
+        $choices    = is_array($choices)  ? $choices : [$choices];
+
+        if (in_array($actualType, $choices) ||
+            (is_json_number($value) && in_array('number', $choices))) {
+            return;
+        }
+
+        throw InvalidSchemaException::invalidParameterType(
+            $actualType,
+            $choices,
+            $keyword,
+            $pointer
+        );
+    }
+}

src/Constraints/AdditionalItems.php

@@ -2,6 +2,7 @@
 
 namespace League\JsonGuard\Constraints;
 
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 use League\JsonGuard\ValidationError;
 
@@ -19,10 +20,13 @@ public static function validate(
         SubSchemaValidatorFactory $validatorFactory,
         $pointer = null
     ) {
+        Assert::type($parameter, ['boolean', 'object'], self::KEYWORD, $pointer);
+
         if (!is_array($data) || $parameter === true) {
             return null;
         }
 
+
         if (!is_array($items = self::getItems($schema))) {
             return null;
         }

src/Constraints/AdditionalProperties.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 use League\JsonGuard\ValidationError;
 
@@ -20,10 +21,13 @@ public static function validate(
         SubSchemaValidatorFactory $validatorFactory,
         $pointer = null
     ) {
+        Assert::type($parameter, ['object', 'boolean'], self::KEYWORD, $pointer);
+
         if (!is_object($data)) {
             return null;
         }
 
+
         $diff = self::getDiff($data, $schema);
 
         if (count($diff) === 0) {

src/Constraints/AllOf.php

@@ -2,6 +2,7 @@
 
 namespace League\JsonGuard\Constraints;
 
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 
 class AllOf implements ContainerInstanceConstraint
@@ -13,9 +14,8 @@ class AllOf implements ContainerInstanceConstraint
      */
     public static function validate($data, $parameter, SubSchemaValidatorFactory $validatorFactory, $pointer = null)
     {
-        if (!is_array($parameter)) {
-            return null;
-        }
+        Assert::type($parameter, 'array', self::KEYWORD, $pointer);
+        Assert::notEmpty($parameter, self::KEYWORD, $pointer);
 
         $errors = [];
 

src/Constraints/AnyOf.php

@@ -2,6 +2,7 @@
 
 namespace League\JsonGuard\Constraints;
 
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 use League\JsonGuard\ValidationError;
 
@@ -14,9 +15,8 @@ class AnyOf implements ContainerInstanceConstraint
      */
     public static function validate($data, $parameter, SubSchemaValidatorFactory $validatorFactory, $pointer = null)
     {
-        if (!is_array($parameter)) {
-            return null;
-        }
+        Assert::type($parameter, 'array', self::KEYWORD, $pointer);
+        Assert::notEmpty($parameter, self::KEYWORD, $pointer);
 
         foreach ($parameter as $schema) {
             $validator = $validatorFactory->makeSubSchemaValidator($data, $schema, $pointer);

src/Constraints/Dependencies.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 use League\JsonGuard\ValidationError;
 
@@ -15,6 +16,8 @@ class Dependencies implements ContainerInstanceConstraint
      */
     public static function validate($data, $parameter, SubSchemaValidatorFactory $validatorFactory, $pointer = null)
     {
+        Assert::type($parameter, ['object', 'array'], self::KEYWORD, $pointer);
+
         $errors = [];
         foreach ($parameter as $property => $dependencies) {
             if (!is_object($data) || !property_exists($data, $property)) {

src/Constraints/Enum.php

@@ -2,8 +2,8 @@
 
 namespace League\JsonGuard\Constraints;
 
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
-use League\JsonGuard;
 
 class Enum implements PropertyConstraint
 {
@@ -14,9 +14,7 @@ class Enum implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
-        if (!is_array($parameter)) {
-            return null;
-        }
+        Assert::type($parameter, 'array', self::KEYWORD, $pointer);
 
         if (in_array($value, $parameter, true)) {
             return null;

src/Constraints/Format.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class Format implements PropertyConstraint
@@ -20,6 +21,8 @@ class Format implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'string', self::KEYWORD, $pointer);
+
         switch ($parameter) {
             case 'date-time':
                 return self::validateRegex(

src/Constraints/Items.php

@@ -2,6 +2,7 @@
 
 namespace League\JsonGuard\Constraints;
 
+use League\JsonGuard\Assert;
 use League\JsonGuard\SubSchemaValidatorFactory;
 
 class Items implements ContainerInstanceConstraint
@@ -13,6 +14,8 @@ class Items implements ContainerInstanceConstraint
      */
     public static function validate($data, $parameter, SubSchemaValidatorFactory $validatorFactory, $pointer = null)
     {
+        Assert::type($parameter, ['array', 'object'], self::KEYWORD, $pointer);
+
         if (!is_array($data)) {
             return null;
         }

src/Constraints/Max.php

@@ -3,18 +3,21 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class Max implements ParentSchemaAwarePropertyConstraint
 {
-    const KEYWORD           = 'max';
-    const EXCLUSIVE_KEYWORD = 'exclusiveMax';
+    const KEYWORD           = 'maximum';
+    const EXCLUSIVE_KEYWORD = 'exclusiveMaximum';
 
     /**
      * {@inheritdoc}
      */
     public static function validate($value, $schema, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'number', self::KEYWORD, $pointer);
+
         if (isset($schema->exclusiveMaximum) && $schema->exclusiveMaximum === true) {
             return self::validateExclusiveMax($value, $parameter, $pointer);
         }

src/Constraints/MaxItems.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class MaxItems implements PropertyConstraint
@@ -14,6 +15,9 @@ class MaxItems implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'integer', self::KEYWORD, $pointer);
+        Assert::nonNegative($parameter, self::KEYWORD, $pointer);
+
         if (!is_array($value) || count($value) <= $parameter) {
             return null;
         }

src/Constraints/MaxLength.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class MaxLength implements PropertyConstraint
@@ -14,6 +15,9 @@ class MaxLength implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'number', self::KEYWORD, $pointer);
+        Assert::nonNegative($parameter, self::KEYWORD, $pointer);
+
         if (!is_string($value) || JsonGuard\strlen($value) <= $parameter) {
             return null;
         }

src/Constraints/MaxProperties.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class MaxProperties implements PropertyConstraint
@@ -14,6 +15,9 @@ class MaxProperties implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'integer', self::KEYWORD, $pointer);
+        Assert::nonNegative($parameter, self::KEYWORD, $pointer);
+
         if (!is_object($value) || count(get_object_vars($value)) <= $parameter) {
             return null;
         }

src/Constraints/Min.php

@@ -3,18 +3,21 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class Min implements ParentSchemaAwarePropertyConstraint
 {
-    const KEYWORD           = 'min';
-    const EXCLUSIVE_KEYWORD = 'exclusiveMin';
+    const KEYWORD           = 'minimum';
+    const EXCLUSIVE_KEYWORD = 'exclusiveMinimum';
 
     /**
      * {@inheritdoc}
      */
     public static function validate($value, $schema, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'number', self::KEYWORD, $pointer);
+
         if (isset($schema->exclusiveMinimum) && $schema->exclusiveMinimum === true) {
             return self::validateExclusiveMin($value, $parameter, $pointer);
         }

src/Constraints/MinItems.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class MinItems implements PropertyConstraint
@@ -14,6 +15,9 @@ class MinItems implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'integer', self::KEYWORD, $pointer);
+        Assert::nonNegative($parameter, self::KEYWORD, $pointer);
+
         if (!is_array($value) || count($value) >= $parameter) {
             return null;
         }

src/Constraints/MinLength.php

@@ -3,6 +3,7 @@
 namespace League\JsonGuard\Constraints;
 
 use League\JsonGuard;
+use League\JsonGuard\Assert;
 use League\JsonGuard\ValidationError;
 
 class MinLength implements PropertyConstraint
@@ -14,6 +15,9 @@ class MinLength implements PropertyConstraint
      */
     public static function validate($value, $parameter, $pointer = null)
     {
+        Assert::type($parameter, 'number', self::KEYWORD, $pointer);
+        Assert::nonNegative($parameter, self::KEYWORD, $pointer);
+
         if (!is_string($value) || JsonGuard\strlen($value) >= $parameter) {
             return null;
         }