dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix/suppress misc phan errors (#4)"
[lhc/web/wiklou.git]
/
maintenance
/
updateExtensionJsonSchema.php
diff --git
a/maintenance/updateExtensionJsonSchema.php
b/maintenance/updateExtensionJsonSchema.php
index
427769f
..
a27c8a5
100644
(file)
--- a/
maintenance/updateExtensionJsonSchema.php
+++ b/
maintenance/updateExtensionJsonSchema.php
@@
-14,12
+14,12
@@
class UpdateExtensionJsonSchema extends Maintenance {
public function execute() {
$filename = $this->getArg( 0 );
if ( !is_readable( $filename ) ) {
public function execute() {
$filename = $this->getArg( 0 );
if ( !is_readable( $filename ) ) {
- $this->
error( "Error: Unable to read $filename", 1
);
+ $this->
fatalError( "Error: Unable to read $filename"
);
}
$json = FormatJson::decode( file_get_contents( $filename ), true );
if ( $json === null ) {
}
$json = FormatJson::decode( file_get_contents( $filename ), true );
if ( $json === null ) {
- $this->
error( "Error: Invalid JSON", 1
);
+ $this->
fatalError( "Error: Invalid JSON"
);
}
if ( !isset( $json['manifest_version'] ) ) {
}
if ( !isset( $json['manifest_version'] ) ) {
@@
-59,11
+59,18
@@
class UpdateExtensionJsonSchema extends Maintenance {
$json['config'][$name]['merge_strategy'] = $value[ExtensionRegistry::MERGE_STRATEGY];
unset( $value[ExtensionRegistry::MERGE_STRATEGY] );
}
$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]
+ );
+ }
}
}
}
}
}
}
}
}
}
}
-$maintClass =
'UpdateExtensionJsonSchema'
;
+$maintClass =
UpdateExtensionJsonSchema::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;