From a25198e6c7c514c143ac1114fadbb342417c2229 Mon Sep 17 00:00:00 2001 From: fmizzell Date: Fri, 21 Sep 2018 16:58:21 -0500 Subject: [PATCH 1/3] Updating json-schema to 5.2.7. --- composer.json | 2 +- open_data_schema_map.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6edb7fe..2fcbb7f 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,6 @@ }, "require": { "symfony/serializer": "^4.0", - "justinrainbow/json-schema": "^5.2" + "justinrainbow/json-schema": "5.2.7" } } diff --git a/open_data_schema_map.make b/open_data_schema_map.make index 44f381e..43ec630 100644 --- a/open_data_schema_map.make +++ b/open_data_schema_map.make @@ -9,4 +9,4 @@ libraries[symfonyserializer][download][tag] = v3.4.2 libraries[json-schema][type] = libraries libraries[json-schema][download][type] = "git" libraries[json-schema][download][url] = "https://github.com/justinrainbow/json-schema.git" -libraries[json-schema][download][tag] = 1.3.7 +libraries[json-schema][download][tag] = 5.2.7 From b4d2c34ae2e53109271203f9567b9406cadb1fc2 Mon Sep 17 00:00:00 2001 From: fmizzell Date: Fri, 21 Sep 2018 17:24:00 -0500 Subject: [PATCH 2/3] Updating the version of symfony serializer and making them match in .make and .json. --- composer.json | 2 +- open_data_schema_map.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2fcbb7f..5d50a99 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "bin-dir": "bin" }, "require": { - "symfony/serializer": "^4.0", + "symfony/serializer": "3.4.15", "justinrainbow/json-schema": "5.2.7" } } diff --git a/open_data_schema_map.make b/open_data_schema_map.make index 43ec630..092cb6d 100644 --- a/open_data_schema_map.make +++ b/open_data_schema_map.make @@ -4,7 +4,7 @@ api = 2 libraries[symfonyserializer][type] = libraries libraries[symfonyserializer][download][type] = "git" libraries[symfonyserializer][download][url] = "https://github.com/symfony/serializer.git" -libraries[symfonyserializer][download][tag] = v3.4.2 +libraries[symfonyserializer][download][tag] = v3.4.15 libraries[json-schema][type] = libraries libraries[json-schema][download][type] = "git" From 87de61041095ffc8aa65480e837b911607bd3ba4 Mon Sep 17 00:00:00 2001 From: fmizzell Date: Tue, 25 Sep 2018 09:41:00 -0500 Subject: [PATCH 3/3] Removing the use of classes that are no longer part of json-schema. --- src/OdsmValidator.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/OdsmValidator.php b/src/OdsmValidator.php index 991648e..c48a02b 100644 --- a/src/OdsmValidator.php +++ b/src/OdsmValidator.php @@ -1,7 +1,5 @@ getDatasetId($dataset); - $retriever = new UriRetriever(); - $schema_info = $this->getSchemaInfo(); - RefResolver::$maxDepth = 10; - $ref_resolver = new RefResolver($retriever); - $ref_resolver->resolve($schema_info->schema, 'file://' . $schema_info->schema_folder . '/'); $validator = new Validator(); $validator->check($dataset, $schema_info->schema);