X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FvalidateRegistrationFile.php;h=b9baf8ce7252e54a5d1b58eed5c4bc8acbb60cd3;hb=2480aae0c97d822e10b50619e7b48b25c45af073;hp=bd34a50eab3a5c1ebadb56a04ec56c8e2ce3389a;hpb=17914cc990c375340b688900b7782f1d7d5339fc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/validateRegistrationFile.php b/maintenance/validateRegistrationFile.php
index bd34a50eab..aa1f668d3b 100644
--- a/maintenance/validateRegistrationFile.php
+++ b/maintenance/validateRegistrationFile.php
@@ -8,45 +8,16 @@ class ValidateRegistrationFile extends Maintenance {
 		$this->addArg( 'path', 'Path to extension.json/skin.json file.', true );
 	}
 	public function execute() {
-		if ( !class_exists( 'JsonSchema\Validato' ) ) {
-			$this->error( 'The JsonSchema library cannot be found, please install it through composer.', 1 );
-		}
-
+		$validator = new ExtensionJsonValidator( function ( $msg ) {
+			$this->error( $msg, 1 );
+		} );
+		$validator->checkDependencies();
 		$path = $this->getArg( 0 );
-		$data = json_decode( file_get_contents( $path ) );
-		if ( !is_object( $data ) ) {
-			$this->error( "$path is not a valid JSON file.", 1 );
-		}
-		if ( !isset( $data->manifest_version ) ) {
-			$this->output( "Warning: No manifest_version set, assuming 1.\n" );
-			// For backwards-compatability assume 1
-			$data->manifest_version = 1;
-		}
-		$version = $data->manifest_version;
-		if ( $version !== ExtensionRegistry::MANIFEST_VERSION ) {
-			$schemaPath = dirname( __DIR__ ) . "/docs/extension.schema.v$version.json";
-		} else {
-			$schemaPath = dirname( __DIR__ ) . '/docs/extension.schema.json';
-		}
-
-		if ( $version < ExtensionRegistry::OLDEST_MANIFEST_VERSION
-			|| $version > ExtensionRegistry::MANIFEST_VERSION
-		) {
-			$this->error( "Error: $path is using a non-supported schema version, it should use "
-				. ExtensionRegistry::MANIFEST_VERSION, 1 );
-		} elseif ( $version < ExtensionRegistry::MANIFEST_VERSION ) {
-			$this->output( "Warning: $path is using a deprecated schema, and should be updated to "
-				. ExtensionRegistry::MANIFEST_VERSION . "\n" );
-		}
-		$validator = new JsonSchema\Validator;
-		$validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] );
-		if ( $validator->isValid() ) {
-			$this->output( "$path validates against the version $version schema!\n" );
-		} else {
-			foreach ( $validator->getErrors() as $error ) {
-				$this->output( "[{$error['property']}] {$error['message']}\n" );
-			}
-			$this->error( "$path does not validate.", 1 );
+		try {
+			$validator->validate( $path );
+			$this->output( "$path validates against the schema!\n" );
+		} catch ( ExtensionJsonValidationError $e ) {
+			$this->error( $e->getMessage(), 1 );
 		}
 	}
 }