Skip to content

Commit

Permalink
Add provided schema under a dummy / internal URI (fixes jsonrainbow#376)
Browse files Browse the repository at this point in the history
In order to resolve internal $ref references within a user-provided
schema, SchemaStorage needs to know about the schema. As user-supplied
schemas do not have an associated URI, use a dummy / internal one instead.
  • Loading branch information
erayd committed Mar 10, 2017
1 parent 3dba977 commit f2f8b0c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/JsonSchema/SchemaStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace JsonSchema;

use JsonSchema\Entity\JsonPointer;
use JsonSchema\Exception\InvalidArgumentException;
use JsonSchema\Exception\UnresolvableJsonPointerException;
use JsonSchema\Iterator\ObjectIterator;
use JsonSchema\Uri\UriResolver;
Expand Down Expand Up @@ -43,7 +44,10 @@ public function getUriResolver()
*/
public function addSchema($id, $schema = null)
{
if (is_null($schema)) {
if (is_null($schema) && $id !== 'internal://provided-schema') {
// if the schema was user-provided to Validator and is still null, then assume this is
// what the user intended, as there's no way for us to retrieve anything else. User-supplied
// schemas do not have an associated URI when passed via Validator::validate().
$schema = $this->uriRetriever->retrieve($id);
}
$objectIterator = new ObjectIterator($schema);
Expand Down
3 changes: 3 additions & 0 deletions src/JsonSchema/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public function validate(&$value, $schema = null, $checkMode = null)
$this->factory->setConfig($checkMode);
}

// add provided schema to SchemaStorage with internal URI to allow internal $ref resolution
$this->factory->getSchemaStorage()->addSchema('internal://provided-schema', $schema);

$validator = $this->factory->createInstanceFor('schema');
$validator->check($value, $schema);

Expand Down
10 changes: 10 additions & 0 deletions tests/SchemaStorageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use JsonSchema\SchemaStorage;
use JsonSchema\Uri\UriRetriever;
use JsonSchema\Validator;
use Prophecy\Argument;

class SchemaStorageTest extends \PHPUnit_Framework_TestCase
Expand All @@ -31,6 +32,15 @@ public function testResolveRef()
);
}

public function testResolveTopRef()
{
$input = json_decode('{"propertyOne":"notANumber"}');
$schema = json_decode('{"$ref":"#/definition","definition":{"properties":{"propertyOne":{"type":"number"}}}}');
$v = new Validator();
$v->validate($input, $schema);
$this->assertFalse($v->isValid());
}

/**
* @depends testResolveRef
*/
Expand Down

0 comments on commit f2f8b0c

Please sign in to comment.