Skip to content

feat: Add support for Draft 6 in NumberConstraint #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: Add support for Draft 6 in NumberConstraint #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/JsonSchema/Constraints/NumberConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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(ConstraintError::EXCLUSIVE_MINIMUM(), $path, array('minimum' => $schema->minimum));
Expand All @@ -36,12 +37,18 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =
} else {
$this->addError(ConstraintError::MISSING_MINIMUM(), $path);
}
} elseif (isset($schema->exclusiveMinimum) && filter_var($schema->exclusiveMinimum, FILTER_VALIDATE_INT)) {
// Draft 6 schema
if ($element <= $schema->exclusiveMinimum) {
$this->addError(ConstraintError::EXCLUSIVE_MINIMUM(), $path, array('exclusiveMinimum' => $schema->exclusiveMinimum));
}
} elseif (isset($schema->minimum) && $element < $schema->minimum) {
$this->addError(ConstraintError::MINIMUM(), $path, array('minimum' => $schema->minimum));
}

// Verify maximum
if (isset($schema->exclusiveMaximum)) {
if (isset($schema->exclusiveMaximum) && filter_var($schema->exclusiveMaximum, FILTER_VALIDATE_INT)) {
// Draft 4 schema
if (isset($schema->maximum)) {
if ($schema->exclusiveMaximum && $element >= $schema->maximum) {
$this->addError(ConstraintError::EXCLUSIVE_MAXIMUM(), $path, array('maximum' => $schema->maximum));
Expand All @@ -51,6 +58,11 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =
} else {
$this->addError(ConstraintError::MISSING_MAXIMUM(), $path);
}
} elseif (isset($schema->exclusiveMaximum) && filter_var($schema->exclusiveMaximum, FILTER_VALIDATE_INT)) {
// Draft 6 schema
if ($element >= $schema->exclusiveMaximum) {
$this->addError(ConstraintError::EXCLUSIVE_MAXIMUM(), $path, array('exclusiveMaximum' => $schema->exclusiveMaximum));
}
} elseif (isset($schema->maximum) && $element > $schema->maximum) {
$this->addError(ConstraintError::MAXIMUM(), $path, array('maximum' => $schema->maximum));
}
Expand Down
34 changes: 28 additions & 6 deletions tests/Constraints/MinimumMaximumTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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}',
'{
Expand Down