Bump json-schema to ~2.0, update RefResolver

Author: jesconstantine

composer.json

@@ -12,7 +12,7 @@
         "psr/log": "^1.0",
         "twig/twig": "1.24.*",
         "silex/silex": "=1.2.5",
-        "justinrainbow/json-schema": "~1.4",
+        "justinrainbow/json-schema": "~2.0",
         "deralex/yaml-config-service-provider": "@dev",
         "monolog/monolog": "~1.6",
         "nesbot/Carbon": "~1.6",

src/PatternKit/ApiControllerProvider.php

@@ -69,14 +69,16 @@ function traverse($data, &$to_test, $i=0, $path="root") {
 
                 function test($data, &$reply) {
                     $retriever = new \JsonSchema\Uri\UriRetriever;
-                    $refResolver = new \JsonSchema\RefResolver($retriever);
-                    $refResolver::$maxDepth = 9999;
+                    $resolver = new \JsonSchema\Uri\UriResolver;
+                    $refResolver = new \JsonSchema\RefResolver($retriever,$resolver);
+                    //  $refResolver::$maxDepth = 9999;
                     $validator = new \JsonSchema\Validator();
                     $valid  = true;
                     foreach ($data as $item) {
                         $path = get_asset_path($item['obj']->name, 'schemas');
                         $schema = $retriever->retrieve('file://' . realpath($path));
-                        $refResolver->resolve($schema);
+//                        $refResolver->resolve($schema);
+                        $refResolver->resolve('file://' . realpath($path));
 
                         //Validate
                         $validator->check($item['obj'], $schema);
@@ -97,8 +99,9 @@ function test($data, &$reply) {
                 $to_test = array();
                 $reply = "";
                 $retriever = new \JsonSchema\Uri\UriRetriever;
-                $refResolver = new \JsonSchema\RefResolver($retriever);
-                $refResolver::$maxDepth = 9999;
+                $resolver = new \JsonSchema\Uri\UriResolver;
+                $refResolver = new \JsonSchema\RefResolver($retriever,$resolver);
+//                $refResolver::$maxDepth = 9999;
                 $validator = new \JsonSchema\Validator();
 
                 $data = (object) json_decode($request->getContent());
@@ -108,7 +111,8 @@ function test($data, &$reply) {
 
                 $schema = $retriever->retrieve('file://' . realpath($path));
 
-                $refResolver->resolve($schema);
+//                $refResolver->resolve($schema);
+                $refResolver->resolve('file://' . realpath($path));
 
                 //Validate
                 $validator->check($data, $schema);

src/PatternKit/SchemaControllerProvider.php

@@ -17,6 +17,7 @@ public function connect(Application $app)
         $controllers->get('/{pattern}', function ($pattern) use ($app) {
 
             $retriever = new \JsonSchema\Uri\UriRetriever;
+            $resolver = new \JsonSchema\Uri\UriResolver;
             $path = get_asset_path($pattern, 'schemas');
             $seed_path = get_asset_path($pattern, 'data');
             $template_path = get_asset_path($pattern, 'templates');
@@ -53,9 +54,10 @@ public function connect(Application $app)
             else $seed_data = array();
 
 
-            $refResolver = new \JsonSchema\RefResolver($retriever);
-            $refResolver::$maxDepth = 9999;
-            $refResolver->resolve($schema);
+            $refResolver = new \JsonSchema\RefResolver($retriever,$resolver);
+//            $refResolver::$maxDepth = 9999;
+//            $refResolver->resolve($schema);
+            $refResolver->resolve('file://' . realpath($path));
 
             if (isset($app['config'])) {
                 $data["app_config"] = $app['config'];