Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305340
Change subject: Synchronize JsonSchema with mediawiki/core
......................................................................
Synchronize JsonSchema with mediawiki/core
Change-Id: I297091f5ef82189eabf78b696fa4110128c96868
See: Ie37e2ebc48684783abf8d99d2f775ee6a5988da7
Bug: T141281
---
M composer.json
M includes/SimpleStyleParser.php
2 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/40/305340/1
diff --git a/composer.json b/composer.json
index 5285b2d..4005ee2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
{
"require": {
- "justinrainbow/json-schema": "1.6.1"
+ "justinrainbow/json-schema": "~3.0"
}
}
diff --git a/includes/SimpleStyleParser.php b/includes/SimpleStyleParser.php
index 48deb2e..cad1988 100644
--- a/includes/SimpleStyleParser.php
+++ b/includes/SimpleStyleParser.php
@@ -3,8 +3,6 @@
namespace Kartographer;
use FormatJson;
-use JsonSchema\RefResolver;
-use JsonSchema\Uri\UriRetriever;
use JsonSchema\Validator;
use Parser;
use PPFrame;
@@ -188,11 +186,7 @@
if ( !$schema ) {
$basePath = 'file://' . dirname( __DIR__ ) . '/schemas';
- $retriever = new UriRetriever();
- $resolver = new RefResolver( $retriever );
- RefResolver::$maxDepth = 20;
- $schema = $retriever->retrieve(
"$basePath/geojson.json", $basePath );
- $resolver->resolve( $schema, $basePath );
+ $schema = (object)[ '$ref' => "$basePath/geojson.json"
];
}
return $schema;
}
--
To view, visit https://gerrit.wikimedia.org/r/305340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I297091f5ef82189eabf78b696fa4110128c96868
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
