Skip to content

Fix draft 3 'required' validation issues #53

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

Merged
justinrainbow merged 6 commits into from
Jul 22, 2013
Merged

Fix draft 3 'required' validation issues #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d5443e
add unit tests for draft 3 'required' objects
alexmmm Jul 14, 2013
cdaf685
fix failing 'required' testcase
alexmmm Jul 14, 2013
61059b2
refactor conditional logic of 'required' validation
alexmmm Jul 14, 2013
e89b755
types of draft 3 'required' properties are not checked when given as …
alexmmm Jul 14, 2013
65d4a0b
separate 'type' from 'required' validation, fixing failing unit tests
alexmmm Jul 14, 2013
08b9971
fix code style
alexmmm Jul 16, 2013
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
19 changes: 10 additions & 9 deletions src/JsonSchema/Constraints/Undefined.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,23 @@ protected function validateCommonProperties($value, $schema = null, $path = null

// Verify required values
if (is_object($value)) {
if ($value instanceof Undefined) {
// Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
if (isset($schema->required) && $schema->required) {
$this->addError($path, "is missing and it is required");
}
} else if (isset($schema->required)) {
if (isset($schema->required) && is_array($schema->required) ) {
// Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]
foreach ($schema->required as $required) {
if (!property_exists($value, $required)) {
$this->addError($path, "the property " . $required . " is required");
}
}
} else {
$this->checkType($value, $schema, $path);
} else if (isset($schema->required)) {
// Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
if ( $schema->required && $value instanceof Undefined) {
$this->addError($path, "is missing and it is required");
}
}
} else {
}

// Verify type
if (!($value instanceof Undefined)) {
$this->checkType($value, $schema, $path);
}

Expand Down
87 changes: 87 additions & 0 deletions tests/JsonSchema/Tests/Constraints/RequiredPropertyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,82 @@ public function getInvalidTests()
'{
"required": ["foo"]
}'
),
array(
'{
}',
'{
"type": "object",
"properties": {
"foo": { "required": true }
}
}'
),
array(
'{
"string":{}
}',
'{
"type":"object",
"properties": {
"string":{"type":"string", "required": true}
}
}'
),
array(
'{
"number":{}
}',
'{
"type":"object",
"properties": {
"number":{"type":"number", "required": true}
}
}'
),
array(
'{
"integer":{}
}',
'{
"type":"object",
"properties": {
"integer":{"type":"integer", "required": true}
}
}'
),
array(
'{
"boolean":{}
}',
'{
"type":"object",
"properties": {
"boolean":{"type":"boolean", "required": true}
}
}'
),
array(
'{
"array":{}
}',
'{
"type":"object",
"properties": {
"array":{"type":"array", "required": true}
}
}'
),
array(
'{
"null":{}
}',
'{
"type":"object",
"properties": {
"null":{"type":"null", "required": true}
}
}'
)
);
}
Expand Down Expand Up @@ -179,6 +255,17 @@ public function getValidTests()
},
"required": ["foo"]
}'
),
array(
'{
"foo": {}
}',
'{
"type": "object",
"properties": {
"foo": { "required": true }
}
}'
)
);
}
Expand Down