Skip to content

Commit 11fd0e8

Browse files
authored
Bump justinrainbow/json-schema to 2.0 (#13)
Bump justinrainbow/json-schema to 2.0
1 parent 403e92a commit 11fd0e8

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"email": "[email protected]"
1212
}
1313
],
14-
"minimum-stability": "dev",
14+
"minimum-stability": "stable",
1515
"require": {
1616
"php": "^5.4 || ^7.0",
17-
"justinrainbow/json-schema": "^1.6",
17+
"justinrainbow/json-schema": "^2.0",
1818
"mtdowling/jmespath.php": "^2.3"
1919
},
2020
"require-dev": {

src/Assert.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace EnricoStahn\JsonAssert;
1313

1414
use JsonSchema\RefResolver;
15+
use JsonSchema\Uri\UriResolver;
1516
use JsonSchema\Uri\UriRetriever;
1617
use JsonSchema\Validator;
1718

@@ -36,16 +37,13 @@ trait Assert
3637
*/
3738
public static function assertJsonMatchesSchema($schema, $content)
3839
{
39-
$retriever = new UriRetriever();
40-
$schema = $retriever->retrieve('file://'.realpath($schema));
41-
4240
// Assume references are relative to the current file
4341
// Create an issue or pull request if you need more complex use cases
44-
$refResolver = new RefResolver($retriever);
45-
$refResolver->resolve($schema, $schema->id);
42+
$refResolver = new RefResolver(new UriRetriever(), new UriResolver());
43+
$schemaObj = $refResolver->resolve('file://'.realpath($schema));
4644

4745
$validator = new Validator();
48-
$validator->check($content, $schema);
46+
$validator->check($content, $schemaObj);
4947

5048
$message = '- Property: %s, Contraint: %s, Message: %s';
5149
$messages = array_map(function ($exception) use ($message) {

0 commit comments

Comments
 (0)