Update justinrainbow/json-schema to version 3

Author: thewilkybarkid

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^5.3.3|^7.0",
-        "justinrainbow/json-schema": "^2.0",
+        "justinrainbow/json-schema": "^3.0",
         "seld/jsonlint": "^1.0",
         "webmozart/assert": "^1.0",
         "webmozart/path-util": "^2.3"

src/JsonValidator.php

@@ -13,10 +13,7 @@
 
 use JsonSchema\Exception\InvalidArgumentException;
 use JsonSchema\Exception\ResourceNotFoundException;
-use JsonSchema\RefResolver;
-use JsonSchema\Uri\UriResolver;
 use JsonSchema\Uri\UriRetriever;
-use JsonSchema\UriResolverInterface;
 use JsonSchema\Validator;
 use Webmozart\PathUtil\Path;
 
@@ -47,26 +44,20 @@ class JsonValidator
      */
     private $validator;
 
-    /**
-     * Reference resolver.
-     *
-     * @var RefResolver
-     */
-    private $resolver;
-
     /**
      * JsonValidator constructor.
      *
-     * @param Validator|null            $validator    JsonSchema\Validator
-     *                                                instance to use
-     * @param UriRetriever|null         $uriRetriever The retriever for fetching
-     *                                                JSON schemas
-     * @param UriResolverInterface|null $uriResolver  The resolver for URIs
+     * @param Validator|null    $validator    JsonSchema\Validator instance
+     *                                        to use
+     * @param UriRetriever|null $uriRetriever The retriever for fetching
+     *                                        JSON schemas
      */
-    public function __construct(Validator $validator = null, UriRetriever $uriRetriever = null, UriResolverInterface $uriResolver = null)
+    public function __construct(Validator $validator = null, UriRetriever $uriRetriever = null)
     {
         $this->validator = $validator ?: new Validator();
-        $this->resolver = new RefResolver($uriRetriever ?: new UriRetriever(), $uriResolver ?: new UriResolver());
+        if ($uriRetriever) {
+            $this->validator->setUriRetriever($uriRetriever);
+        }
     }
 
     /**
@@ -107,6 +98,8 @@ public function validate($data, $schema = null)
 
         try {
             $this->validator->check($data, $schema);
+        } catch (ResourceNotFoundException $e) {
+            throw new InvalidSchemaException($e->getMessage(), $e->getCode(), $e);
         } catch (InvalidArgumentException $e) {
             throw new InvalidSchemaException(sprintf(
                 'The schema is invalid: %s',
@@ -134,6 +127,8 @@ private function assertSchemaValid($schema)
             // The meta schema is obviously not validated. If we
             // validate it against itself, we have an endless recursion
             $this->metaSchema = json_decode(file_get_contents(__DIR__.'/../res/meta-schema.json'));
+
+            $this->validator->getSchemaStorage()->addSchema('http://json-schema.org/draft-04/schema', $this->metaSchema);
         }
 
         if ($schema === $this->metaSchema) {
@@ -148,6 +143,10 @@ private function assertSchemaValid($schema)
                 implode("\n", $errors)
             ));
         }
+
+        if (!isset($schema->{'$ref'})) {
+            $this->validator->getSchemaStorage()->addSchema($schema->id, $schema);
+        }
     }
 
     private function loadSchema($file)
@@ -160,15 +159,7 @@ private function loadSchema($file)
             $file = 'file://'.$file;
         }
 
-        // Resolve references to other schemas
-        try {
-            $schema = $this->resolver->resolve($file);
-        } catch (ResourceNotFoundException $e) {
-            throw new InvalidSchemaException(sprintf(
-                'The schema %s does not exist.',
-                $file
-            ), 0, $e);
-        }
+        $schema = (object) array('$ref' => $file);
 
         try {
             $this->assertSchemaValid($schema);

tests/Fixtures/schema-invalid.json

@@ -180,28 +180,6 @@ public function testValidateFailsIfSchemaNeitherStringNorObject()
         $this->validator->validate((object) array('name' => 'Bernhard'), 12345);
     }
 
-    /**
-     * @expectedException \Webmozart\Json\InvalidSchemaException
-     */
-    public function testValidateFailsIfSchemaFileContainsNoObject()
-    {
-        $this->validator->validate(
-            (object) array('name' => 'Bernhard'),
-            $this->fixturesDir.'/schema-no-object.json'
-        );
-    }
-
-    /**
-     * @expectedException \Webmozart\Json\InvalidSchemaException
-     */
-    public function testValidateFailsIfSchemaFileInvalid()
-    {
-        $this->validator->validate(
-            (object) array('name' => 'Bernhard'),
-            $this->fixturesDir.'/schema-invalid.json'
-        );
-    }
-
     /**
      * @expectedException \Webmozart\Json\InvalidSchemaException
      */