File tree Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Original file line number Diff line number Diff line change 1111 "email" : " enrico.stahn@gmail.com"
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" : {
Original file line number Diff line number Diff line change 1212namespace EnricoStahn \JsonAssert ;
1313
1414use JsonSchema \RefResolver ;
15+ use JsonSchema \Uri \UriResolver ;
1516use JsonSchema \Uri \UriRetriever ;
1617use 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 ) {
You can’t perform that action at this time.
0 commit comments