From f8fcff31aaaf3230ab69c57d7bb4e5b7adc5bc0b Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 22 Mar 2019 20:34:37 +0000 Subject: [PATCH] resources: Make manageForeignResources a regular maint script The maintenance script was previously in a subdirectory which is a bit unusual. It's now a regular maintenance script, with the YAML file in a more discoverable place as well. Change-Id: I38690f23dbe89839bee0e1d43ecfd68adeb19c0f --- autoload.php | 2 +- maintenance/{resources => }/manageForeignResources.php | 4 ++-- .../resources => resources/lib}/foreign-resources.yaml | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename maintenance/{resources => }/manageForeignResources.php (96%) rename {maintenance/resources => resources/lib}/foreign-resources.yaml (100%) diff --git a/autoload.php b/autoload.php index bbfe251283..a69a9974ee 100644 --- a/autoload.php +++ b/autoload.php @@ -851,7 +851,7 @@ $wgAutoloadLocalClasses = [ 'Maintenance' => __DIR__ . '/maintenance/Maintenance.php', 'MakeTestEdits' => __DIR__ . '/maintenance/makeTestEdits.php', 'MalformedTitleException' => __DIR__ . '/includes/title/MalformedTitleException.php', - 'ManageForeignResources' => __DIR__ . '/maintenance/resources/manageForeignResources.php', + 'ManageForeignResources' => __DIR__ . '/maintenance/manageForeignResources.php', 'ManageJobs' => __DIR__ . '/maintenance/manageJobs.php', 'ManualLogEntry' => __DIR__ . '/includes/logging/LogEntry.php', 'MapCacheLRU' => __DIR__ . '/includes/libs/MapCacheLRU.php', diff --git a/maintenance/resources/manageForeignResources.php b/maintenance/manageForeignResources.php similarity index 96% rename from maintenance/resources/manageForeignResources.php rename to maintenance/manageForeignResources.php index 6de82c0912..87f2e83144 100644 --- a/maintenance/resources/manageForeignResources.php +++ b/maintenance/manageForeignResources.php @@ -19,7 +19,7 @@ * @ingroup Maintenance */ -require_once __DIR__ . '/../Maintenance.php'; +require_once __DIR__ . '/Maintenance.php'; /** * Manage foreign resources registered with ResourceLoader. @@ -55,7 +55,7 @@ TEXT public function execute() { global $IP; $frm = new ForeignResourceManager( - __DIR__ . '/foreign-resources.yaml', + "{$IP}/resources/lib/foreign-resources.yaml", "{$IP}/resources/lib", function ( $text ) { $this->output( $text ); diff --git a/maintenance/resources/foreign-resources.yaml b/resources/lib/foreign-resources.yaml similarity index 100% rename from maintenance/resources/foreign-resources.yaml rename to resources/lib/foreign-resources.yaml -- 2.20.1