Skip to content

Add *Of properties to RefResolver #78

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
merged 2 commits into from
Dec 7, 2013
Merged

Add *Of properties to RefResolver #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5478d
Add *Of properties to RefResolver
hglattergotz Oct 10, 2013
6d8dbed
Update test case to account for 3 additional parameters
hglattergotz Oct 10, 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
2 changes: 1 addition & 1 deletion src/JsonSchema/RefResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function resolve($schema, $sourceUri = null)
// These are all potentially arrays that contain schema objects
// eg. type can be a value or an array of values/schemas
// eg. items can be a schema or an array of schemas
foreach (array('disallow', 'extends', 'items', 'type') as $propertyName) {
foreach (array('disallow', 'extends', 'items', 'type', 'allOf', 'anyOf', 'oneOf') as $propertyName) {
$this->resolveArrayOfSchemas($schema, $propertyName, $sourceUri);
}

Expand Down
2 changes: 1 addition & 1 deletion tests/JsonSchema/Tests/RefResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function resolveProvider() {
array(
'resolveRef' => 1,
'resolveProperty' => 4,
'resolveArrayOfSchemas' => 4,
'resolveArrayOfSchemas' => 7,
'resolveObjectOfSchemas' => 3
)
)
Expand Down