feat: Add support for Draft 6 in NumberConstraint

jsonrainbow · Dec 14, 2023 · e74fdd7 · e74fdd7
1 parent fbbe7e5
commit e74fdd7
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 9 deletions.
diff --git a/src/JsonSchema/Constraints/NumberConstraint.php b/src/JsonSchema/Constraints/NumberConstraint.php
@@ -25,7 +25,8 @@ class NumberConstraint extends Constraint
     public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
     {
         // Verify minimum
-        if (isset($schema->exclusiveMinimum)) {
+        if (isset($schema->exclusiveMinimum) && filter_var($schema->exclusiveMinimum, FILTER_VALIDATE_BOOLEAN)) {
+            // Draft 4 schema
             if (isset($schema->minimum)) {
                 if ($schema->exclusiveMinimum && $element <= $schema->minimum) {
                     $this->addError($path, 'Must have a minimum value of ' . $schema->minimum, 'exclusiveMinimum', array('minimum' => $schema->minimum));
@@ -35,12 +36,18 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =
             } else {
                 $this->addError($path, 'Use of exclusiveMinimum requires presence of minimum', 'missingMinimum');
             }
+        } elseif (isset($schema->exclusiveMinimum) && filter_var($schema->exclusiveMinimum, FILTER_VALIDATE_INT)) {
+            // Draft 6 schema
+            if ($element <= $schema->exclusiveMinimum) {
+                $this->addError($path, 'Must have an exclusiveMinimum value of ' . $schema->exclusiveMinimum, 'exclusiveMinimum', array('exclusiveMinimum' => $schema->exclusiveMinimum));
+            }
         } elseif (isset($schema->minimum) && $element < $schema->minimum) {
             $this->addError($path, 'Must have a minimum value of ' . $schema->minimum, 'minimum', array('minimum' => $schema->minimum));
         }
 
         // Verify maximum
-        if (isset($schema->exclusiveMaximum)) {
+        if (isset($schema->exclusiveMaximum) && filter_var($schema->exclusiveMaximum, FILTER_VALIDATE_BOOLEAN)) {
+            // Draft 4 schema
             if (isset($schema->maximum)) {
                 if ($schema->exclusiveMaximum && $element >= $schema->maximum) {
                     $this->addError($path, 'Must have a maximum value of ' . $schema->maximum, 'exclusiveMaximum', array('maximum' => $schema->maximum));
@@ -50,6 +57,11 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =
             } else {
                 $this->addError($path, 'Use of exclusiveMaximum requires presence of maximum', 'missingMaximum');
             }
+        } elseif (isset($schema->exclusiveMaximum) && filter_var($schema->exclusiveMaximum, FILTER_VALIDATE_INT)) {
+            // Draft 6 schema
+            if ($element >= $schema->exclusiveMaximum) {
+                $this->addError($path, 'Must have an exclusiveMaximum value of ' . $schema->exclusiveMaximum, 'exclusiveMaximum', array('exclusiveMaximum' => $schema->exclusiveMaximum));
+            }
         } elseif (isset($schema->maximum) && $element > $schema->maximum) {
             $this->addError($path, 'Must have a maximum value of ' . $schema->maximum, 'maximum', array('maximum' => $schema->maximum));
         }

diff --git a/tests/Constraints/MinimumMaximumTest.php b/tests/Constraints/MinimumMaximumTest.php
@@ -28,12 +28,25 @@ public function getInvalidTests()
                 }'
             ),
             array(
-                '{"value": 3}',
                 '{
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "integer", "minimum": 3, "exclusiveMinimum": true}
-                    }
+                  "value":16
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","maximum":8}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":2
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","exclusiveMinimum":2}
+                  }
                 }'
             ),
             array(
@@ -43,10 +56,19 @@ public function getInvalidTests()
                 '{
                   "type":"object",
                   "properties":{
-                    "value":{"type":"integer","maximum":8}
+                    "value":{"type":"integer","exclusiveMaximum":16}
                   }
                 }'
             ),
+            array(
+                '{"value": 3}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {"type": "integer", "minimum": 3, "exclusiveMinimum": true}
+                    }
+                }'
+            ),
             array(
                 '{"value": 8}',
                 '{
@@ -106,7 +128,7 @@ public function getInvalidTests()
                         "value": {"type": "number", "maximum": 0, "exclusiveMaximum": true}
                     }
                 }'
-            )
+            ),
         );
     }