Skip to content

Use same RefResolver #25

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 1 commit into from
Aug 15, 2016
Merged

Use same RefResolver #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 5 additions & 16 deletions src/JsonValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use JsonSchema\Exception\InvalidArgumentException;
use JsonSchema\Exception\ResourceNotFoundException;
use JsonSchema\RefResolver;
use JsonSchema\Uri\Retrievers\UriRetrieverInterface;
use JsonSchema\Uri\UriResolver;
use JsonSchema\Uri\UriRetriever;
use JsonSchema\UriResolverInterface;
Expand Down Expand Up @@ -49,18 +48,11 @@ class JsonValidator
private $validator;

/**
* URI retriever for fetching JSON schemas.
* Reference resolver.
*
* @var UriRetrieverInterface
* @var RefResolver
*/
private $uriRetriever;

/**
* URI resolver for JSON schemas.
*
* @var UriResolverInterface
*/
private $uriResolver;
private $resolver;

/**
* JsonValidator constructor.
Expand All @@ -74,8 +66,7 @@ class JsonValidator
public function __construct(Validator $validator = null, UriRetriever $uriRetriever = null, UriResolverInterface $uriResolver = null)
{
$this->validator = $validator ?: new Validator();
$this->uriRetriever = $uriRetriever ?: new UriRetriever();
$this->uriResolver = $uriResolver ?: new UriResolver();
$this->resolver = new RefResolver($uriRetriever ?: new UriRetriever(), $uriResolver ?: new UriResolver());
}

/**
Expand Down Expand Up @@ -170,10 +161,8 @@ private function loadSchema($file)
}

// Resolve references to other schemas
$resolver = new RefResolver($this->uriRetriever, $this->uriResolver);

try {
$schema = $resolver->resolve($file);
$schema = $this->resolver->resolve($file);
} catch (ResourceNotFoundException $e) {
throw new InvalidSchemaException(sprintf(
'The schema %s does not exist.',
Expand Down