Update justinrainbow/json-schema to ~5.0

composer.json

@@ -9,7 +9,7 @@
         "php": ">=5.4",
         "behat/behat": "~3.0",
         "behat/mink-extension": "~2.0",
-        "justinrainbow/json-schema": "~1.4",
+        "justinrainbow/json-schema": "~5.0",
         "symfony/property-access": "~2.3|~3.0",
         "symfony/http-foundation": "~2.3|~3.0"
     },

src/Json/Json.php

@@ -6,7 +6,7 @@
 
 class Json
 {
-    private $content;
+    protected $content;
 
     public function __construct($content)
     {

src/Json/JsonInspector.php

@@ -2,9 +2,7 @@
 
 namespace Behatch\Json;
 
-use JsonSchema\RefResolver;
 use JsonSchema\Validator;
-use JsonSchema\Uri\UriRetriever;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 class JsonInspector
@@ -34,9 +32,21 @@ public function evaluate(Json $json, $expression)
 
     public function validate(Json $json, JsonSchema $schema)
     {
-        return $schema
-            ->resolve(new RefResolver(new UriRetriever))
-            ->validate($json, new Validator)
-        ;
+        $validator = new \JsonSchema\Validator();
+
+        $resolver = new \JsonSchema\SchemaStorage(new \JsonSchema\Uri\UriRetriever, new \JsonSchema\Uri\UriResolver);
+        $schema->resolve($resolver);
+
+        $validator->check($json->getContent(), $schema->getContent());
+        $isValid = $validator->isValid();
+        if (!$isValid) {
+            $msg = "JSON does not validate. Violations:".PHP_EOL;
+            foreach ($validator->getErrors() as $error) {
+                $msg .= sprintf("  - [%s] %s".PHP_EOL, $error['property'], $error['message']);
+            }
+            throw new \Exception($msg);
+        }
+
+        return $isValid;
     }
 }

src/Json/JsonSchema.php

@@ -2,7 +2,7 @@
 
 namespace Behatch\Json;
 
-use JsonSchema\RefResolver;
+use JsonSchema\SchemaStorage;
 use JsonSchema\Validator;
 
 class JsonSchema extends Json
@@ -12,16 +12,17 @@ class JsonSchema extends Json
     public function __construct($content, $uri = null)
     {
         $this->uri = $uri;
+
         parent::__construct($content);
     }
 
-    public function resolve(RefResolver $resolver)
+    public function resolve(SchemaStorage $resolver)
     {
         if (!$this->hasUri()) {
             return $this;
         }
 
-        $resolver->resolve($this->getContent(), $this->uri);
+        $this->content = $resolver->resolveRef($this->uri);
 
         return $this;
     }

tests/fixtures/files/schema.json

@@ -0,0 +1,2 @@
+{
+}

tests/units/Json/JsonInspector.php

@@ -2,7 +2,6 @@
 
 namespace Behatch\Tests\Units\Json;
 
-use JsonSchema\RefResolver;
 use JsonSchema\Validator;
 use JsonSchema\Uri\UriRetriever;
 use Symfony\Component\PropertyAccess\PropertyAccess;

tests/units/Json/JsonSchema.php

@@ -7,18 +7,19 @@ class JsonSchema extends \atoum
     public function test_resolve_without_uri()
     {
         $schema = $this->newTestedInstance('{}');
-        $resolver = new \JsonSchema\RefResolver();
+        $resolver = new \JsonSchema\SchemaStorage(new \JsonSchema\Uri\UriRetriever, new \JsonSchema\Uri\UriResolver);
         $schema->resolve($resolver);
     }
 
     public function test_resolve_with_uri()
     {
-        $schema = $this->newTestedInstance('{}', 'file://test');
-        $resolver = new \JsonSchema\RefResolver();
-        $result = $schema->resolve($resolver);
+        $file = 'file://' . __DIR__ . '/../../fixtures/files/schema.json';
+        $schema = (object)['id' => $file];
+        $resolver = new \JsonSchema\SchemaStorage(new \JsonSchema\Uri\UriRetriever, new \JsonSchema\Uri\UriResolver);
+        $result = $resolver->resolveRef($file);
 
         $this->object($result)
-            ->isIdenticalTo($schema);
+            ->isEqualTo($schema);
     }
 
     public function test_validate()