Skip to content

Commit dea4e26

Browse files
committed
Merge pull request #78 from hglattergotz/ofPropertyFix
Add *Of properties to RefResolver
2 parents 22d97c2 + 6d8dbed commit dea4e26

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/JsonSchema/RefResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function resolve($schema, $sourceUri = null)
116116
// These are all potentially arrays that contain schema objects
117117
// eg. type can be a value or an array of values/schemas
118118
// eg. items can be a schema or an array of schemas
119-
foreach (array('disallow', 'extends', 'items', 'type') as $propertyName) {
119+
foreach (array('disallow', 'extends', 'items', 'type', 'allOf', 'anyOf', 'oneOf') as $propertyName) {
120120
$this->resolveArrayOfSchemas($schema, $propertyName, $sourceUri);
121121
}
122122

tests/JsonSchema/Tests/RefResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function resolveProvider() {
4343
array(
4444
'resolveRef' => 1,
4545
'resolveProperty' => 4,
46-
'resolveArrayOfSchemas' => 4,
46+
'resolveArrayOfSchemas' => 7,
4747
'resolveObjectOfSchemas' => 3
4848
)
4949
)

0 commit comments

Comments
 (0)