From 8136216d631626875950e8b5c5a156a93b3779c3 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 16 Oct 2018 11:12:43 -0400 Subject: [PATCH] Have maintenance/updateExtensionJsonSchema.php copy documentation It already skips version-1 style documentation keys that begin with "@". It should also copy them into the "description" metadata key for version 2. Change-Id: I460568f074b9c0256eb6bbbcd0b046b16e0d8790 --- maintenance/updateExtensionJsonSchema.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintenance/updateExtensionJsonSchema.php b/maintenance/updateExtensionJsonSchema.php index 6233d5b876..a27c8a517f 100644 --- a/maintenance/updateExtensionJsonSchema.php +++ b/maintenance/updateExtensionJsonSchema.php @@ -59,6 +59,13 @@ class UpdateExtensionJsonSchema extends Maintenance { $json['config'][$name]['merge_strategy'] = $value[ExtensionRegistry::MERGE_STRATEGY]; unset( $value[ExtensionRegistry::MERGE_STRATEGY] ); } + if ( isset( $config["@$name"] ) ) { + // Put 'description' first for better human-legibility. + $json['config'][$name] = array_merge( + [ 'description' => $config["@$name"] ], + $json['config'][$name] + ); + } } } } -- 2.20.1