From 93d44c9a4209457ca55a39b9649661f022456dd2 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 8 Jan 2018 13:10:35 -0800 Subject: [PATCH] Move BaseDump into includes/export/ There's no reason for this to have to live in Maintenance land. It's generally useful and lets us avoid some random require/include calls Change-Id: I60419c7f9fc52313905053bbeb3aa81666c9160c --- autoload.php | 2 +- maintenance/backupPrefetch.inc => includes/export/BaseDump.php | 0 maintenance/dumpTextPass.php | 3 --- tests/phan/config.php | 1 - tests/phpunit/maintenance/backupPrefetchTest.php | 2 -- 5 files changed, 1 insertion(+), 7 deletions(-) rename maintenance/backupPrefetch.inc => includes/export/BaseDump.php (100%) diff --git a/autoload.php b/autoload.php index 351136dc3e..058d4f6442 100644 --- a/autoload.php +++ b/autoload.php @@ -175,7 +175,7 @@ $wgAutoloadLocalClasses = [ 'BadRequestError' => __DIR__ . '/includes/exception/BadRequestError.php', 'BadTitleError' => __DIR__ . '/includes/exception/BadTitleError.php', 'BagOStuff' => __DIR__ . '/includes/libs/objectcache/BagOStuff.php', - 'BaseDump' => __DIR__ . '/maintenance/backupPrefetch.inc', + 'BaseDump' => __DIR__ . '/includes/export/BaseDump.php', 'BaseTemplate' => __DIR__ . '/includes/skins/BaseTemplate.php', 'BashkirUppercaseCollation' => __DIR__ . '/includes/collation/BashkirUppercaseCollation.php', 'BatchRowIterator' => __DIR__ . '/includes/utils/BatchRowIterator.php', diff --git a/maintenance/backupPrefetch.inc b/includes/export/BaseDump.php similarity index 100% rename from maintenance/backupPrefetch.inc rename to includes/export/BaseDump.php diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 0604f4886b..e18d0b8723 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -143,8 +143,6 @@ TEXT } function processOptions() { - global $IP; - parent::processOptions(); if ( $this->hasOption( 'buffersize' ) ) { @@ -152,7 +150,6 @@ TEXT } if ( $this->hasOption( 'prefetch' ) ) { - require_once "$IP/maintenance/backupPrefetch.inc"; $url = $this->processFileOpt( $this->getOption( 'prefetch' ) ); $this->prefetch = new BaseDump( $url ); } diff --git a/tests/phan/config.php b/tests/phan/config.php index 0df835749b..52a565c5fa 100644 --- a/tests/phan/config.php +++ b/tests/phan/config.php @@ -41,7 +41,6 @@ return [ [ 'maintenance/7zip.inc', 'maintenance/backup.inc', - 'maintenance/backupPrefetch.inc', 'maintenance/cleanupTable.inc', 'maintenance/CodeCleanerGlobalsPass.inc', 'maintenance/commandLine.inc', diff --git a/tests/phpunit/maintenance/backupPrefetchTest.php b/tests/phpunit/maintenance/backupPrefetchTest.php index 010bb171d1..0e2e1453ea 100644 --- a/tests/phpunit/maintenance/backupPrefetchTest.php +++ b/tests/phpunit/maintenance/backupPrefetchTest.php @@ -1,7 +1,5 @@