Skip to content

Commit 0483406

Browse files
committed
Correct format for id & $ref in draft-03/04 meta-schemas
See json-schema-org/JSON-Schema-Test-Suite#177 (comment)
1 parent b9176c6 commit 0483406

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

src/JsonSchema/SchemaStorage.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,17 @@ public function addSchema($id, $schema = null)
5858
$schema = BaseConstraint::arrayToObjectRecursive($schema);
5959
}
6060

61+
// workaround for bug in draft-03 & draft-04 meta-schemas (id & $ref defined with incorrect format)
62+
// see https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues/177#issuecomment-293051367
63+
if (is_object($schema) && property_exists($schema, 'id')) {
64+
if ($schema->id == 'http://json-schema.org/draft-04/schema#') {
65+
$schema->properties->id->format = 'uri-reference';
66+
} elseif ($schema->id == 'http://json-schema.org/draft-03/schema#') {
67+
$schema->properties->id->format = 'uri-reference';
68+
$schema->properties->{'$ref'}->format = 'uri-reference';
69+
}
70+
}
71+
6172
$objectIterator = new ObjectIterator($schema);
6273
foreach ($objectIterator as $toResolveSchema) {
6374
if (property_exists($toResolveSchema, '$ref') && is_string($toResolveSchema->{'$ref'})) {

tests/SchemaStorageTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,17 @@ public function testGetUriResolver()
289289
$s->addSchema('http://json-schema.org/draft-04/schema#');
290290
$this->assertInstanceOf('\JsonSchema\Uri\UriResolver', $s->getUriResolver());
291291
}
292+
293+
public function testMetaSchemaFixes()
294+
{
295+
$s = new SchemaStorage();
296+
$s->addSchema('http://json-schema.org/draft-03/schema#');
297+
$s->addSchema('http://json-schema.org/draft-04/schema#');
298+
$draft_03 = $s->getSchema('http://json-schema.org/draft-03/schema#');
299+
$draft_04 = $s->getSchema('http://json-schema.org/draft-04/schema#');
300+
301+
$this->assertEquals('uri-reference', $draft_03->properties->id->format);
302+
$this->assertEquals('uri-reference', $draft_03->properties->{'$ref'}->format);
303+
$this->assertEquals('uri-reference', $draft_04->properties->id->format);
304+
}
292305
}

0 commit comments

Comments
 (0)