Add namespace to maintenance/includes classes

Also a few other fixes of PHP class aliases spotted by phan.

Bug: T353458
Change-Id: Ie79d65722c47c24f8f20f1293355cfd3c2e8c2ad

12 files changed, 80 insertions, 13 deletions

diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index f8923f9de2af..fc673eb2bee2 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -26,6 +26,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Maintenance\BackupDumper;
+
 // @codeCoverageIgnoreStart
 require_once __DIR__ . '/includes/BackupDumper.php';
 // @codeCoverageIgnoreEnd
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index aedaddf99671..cdeeaeefe9d9 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -37,6 +37,7 @@ require_once __DIR__ . '/Maintenance.php';
 // @codeCoverageIgnoreEnd
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\Specials\SpecialUpload;
 use MediaWiki\StubObject\StubGlobalUser;
 use MediaWiki\Title\Title;
@@ -432,7 +433,7 @@ class ImportImages extends Maintenance {
 	 * @param string $dir Path to directory to search
 	 * @param array $exts Array of lowercase extensions to search for
 	 * @param bool $recurse Search subdirectories recursively
-	 * @return Generator<string> Generator that iterating filenames
+	 * @return \Generator<string> Generator that iterating filenames
 	 */
 	private function findFiles( $dir, $exts, $recurse = false ) {
 		$dhl = is_dir( $dir ) ? opendir( $dir ) : false;
diff --git a/maintenance/includes/BackupDumper.php b/maintenance/includes/BackupDumper.php
index 8950bd14ef4b..7d47979080a3 100644
--- a/maintenance/includes/BackupDumper.php
+++ b/maintenance/includes/BackupDumper.php
@@ -25,16 +25,23 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 // @codeCoverageIgnoreStart
 require_once __DIR__ . '/../Maintenance.php';
 require_once __DIR__ . '/../../includes/export/WikiExporter.php';
 // @codeCoverageIgnoreEnd
 
+use DumpMultiWriter;
+use DumpOutput;
+use ExportProgressFilter;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Settings\SettingsBuilder;
 use MediaWiki\WikiMap\WikiMap;
+use WikiExporter;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
+use XmlDumpWriter;
 
 /**
  * @ingroup Dump
@@ -140,16 +147,16 @@ abstract class BackupDumper extends Maintenance {
 		$this->stderr = fopen( "php://stderr", "wt" );
 
 		// Built-in output and filter plugins
-		$this->registerOutput( 'file', DumpFileOutput::class );
-		$this->registerOutput( 'gzip', DumpGZipOutput::class );
-		$this->registerOutput( 'bzip2', DumpBZip2Output::class );
-		$this->registerOutput( 'dbzip2', DumpDBZip2Output::class );
-		$this->registerOutput( 'lbzip2', DumpLBZip2Output::class );
-		$this->registerOutput( '7zip', Dump7ZipOutput::class );
+		$this->registerOutput( 'file', \DumpFileOutput::class );
+		$this->registerOutput( 'gzip', \DumpGZipOutput::class );
+		$this->registerOutput( 'bzip2', \DumpBZip2Output::class );
+		$this->registerOutput( 'dbzip2', \DumpDBZip2Output::class );
+		$this->registerOutput( 'lbzip2', \DumpLBZip2Output::class );
+		$this->registerOutput( '7zip', \Dump7ZipOutput::class );
 
-		$this->registerFilter( 'latest', DumpLatestFilter::class );
-		$this->registerFilter( 'notalk', DumpNotalkFilter::class );
-		$this->registerFilter( 'namespace', DumpNamespaceFilter::class );
+		$this->registerFilter( 'latest', \DumpLatestFilter::class );
+		$this->registerFilter( 'notalk', \DumpNotalkFilter::class );
+		$this->registerFilter( 'namespace', \DumpNamespaceFilter::class );
 
 		// These three can be specified multiple times
 		$this->addOption( 'plugin', 'Load a dump plugin class. Specify as <class>[:<file>].',
@@ -482,3 +489,6 @@ abstract class BackupDumper extends Maintenance {
 		}
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( BackupDumper::class, 'BackupDumper' );
diff --git a/maintenance/includes/Benchmarker.php b/maintenance/includes/Benchmarker.php
index 7dadd79c2788..2e22779f7b8c 100644
--- a/maintenance/includes/Benchmarker.php
+++ b/maintenance/includes/Benchmarker.php
@@ -26,6 +26,8 @@
  * @ingroup Benchmark
  */
 
+namespace MediaWiki\Maintenance;
+
 use Wikimedia\RunningStat;
 
 // @codeCoverageIgnoreStart
@@ -232,3 +234,6 @@ abstract class Benchmarker extends Maintenance {
 		return $content;
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( Benchmarker::class, 'Benchmarker' );
diff --git a/maintenance/includes/DeleteLocalPasswords.php b/maintenance/includes/DeleteLocalPasswords.php
index a08ed7d50322..6e9323cad4b9 100644
--- a/maintenance/includes/DeleteLocalPasswords.php
+++ b/maintenance/includes/DeleteLocalPasswords.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 use MediaWiki\Password\InvalidPassword;
 use MediaWiki\Password\PasswordFactory;
 use Wikimedia\Rdbms\IDatabase;
@@ -168,7 +170,7 @@ ERROR
 	 * Subclasses should reimplement this and locate users who use the specific authentication
 	 * method. The default implementation just iterates through all users. Extensions that work
 	 * with wikifarm should also update self::getUserDB() as necessary.
-	 * @return Generator
+	 * @return \Generator
 	 */
 	protected function getUserBatches() {
 		if ( $this->user !== null ) {
@@ -195,3 +197,6 @@ ERROR
 		} while ( count( $users ) === $this->getBatchSize() );
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( DeleteLocalPasswords::class, 'DeleteLocalPasswords' );
diff --git a/maintenance/includes/FakeMaintenance.php b/maintenance/includes/FakeMaintenance.php
index 7db015aa0183..3f5c139cbdec 100644
--- a/maintenance/includes/FakeMaintenance.php
+++ b/maintenance/includes/FakeMaintenance.php
@@ -18,6 +18,8 @@
  * @file
  */
 
+namespace MediaWiki\Maintenance;
+
 /**
  * Fake maintenance wrapper, mostly used for the web installer/updater
  * @ingroup Maintenance
@@ -30,3 +32,6 @@ class FakeMaintenance extends Maintenance {
 	public function execute() {
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( FakeMaintenance::class, 'FakeMaintenance' );
diff --git a/maintenance/includes/LoggedUpdateMaintenance.php b/maintenance/includes/LoggedUpdateMaintenance.php
index 66950639a602..27bc114ddc0c 100644
--- a/maintenance/includes/LoggedUpdateMaintenance.php
+++ b/maintenance/includes/LoggedUpdateMaintenance.php
@@ -18,6 +18,8 @@
  * @file
  */
 
+namespace MediaWiki\Maintenance;
+
 /**
  * Class for scripts that perform database maintenance and want to log the
  * update in `updatelog` so we can later skip it
@@ -90,3 +92,6 @@ abstract class LoggedUpdateMaintenance extends Maintenance {
 	 */
 	abstract protected function getUpdateKey();
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( LoggedUpdateMaintenance::class, 'LoggedUpdateMaintenance' );
diff --git a/maintenance/includes/MWDoxygenFilter.php b/maintenance/includes/MWDoxygenFilter.php
index 14dd49955567..545550b5cde0 100644
--- a/maintenance/includes/MWDoxygenFilter.php
+++ b/maintenance/includes/MWDoxygenFilter.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 /**
  * Doxygen filter to show correct member variable types in documentation.
  *
@@ -139,3 +141,6 @@ class MWDoxygenFilter {
 		return $output;
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( MWDoxygenFilter::class, 'MWDoxygenFilter' );
diff --git a/maintenance/includes/Maintenance.php b/maintenance/includes/Maintenance.php
index a874e24e7cf5..876f44e0bc9f 100644
--- a/maintenance/includes/Maintenance.php
+++ b/maintenance/includes/Maintenance.php
@@ -18,17 +18,20 @@
  * @file
  */
 
+namespace MediaWiki\Maintenance;
+
+use ExecutableFinder;
+use MediaWiki;
 use MediaWiki\Config\Config;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
-use MediaWiki\Maintenance\MaintenanceFatalError;
-use MediaWiki\Maintenance\MaintenanceParameters;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Settings\SettingsBuilder;
 use MediaWiki\Shell\Shell;
 use MediaWiki\User\User;
+use StatusValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
@@ -1492,3 +1495,6 @@ abstract class Maintenance {
 		return $line;
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( Maintenance::class, 'Maintenance' );
diff --git a/maintenance/includes/SchemaMaintenance.php b/maintenance/includes/SchemaMaintenance.php
index 9e8a066d1ec6..8c3076a10d60 100644
--- a/maintenance/includes/SchemaMaintenance.php
+++ b/maintenance/includes/SchemaMaintenance.php
@@ -22,6 +22,8 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 use Doctrine\SqlFormatter\NullHighlighter;
 use Doctrine\SqlFormatter\SqlFormatter;
 use MediaWiki\DB\AbstractSchemaValidationError;
@@ -302,3 +304,6 @@ abstract class SchemaMaintenance extends Maintenance {
 		return $abstractSchema;
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( SchemaMaintenance::class, 'SchemaMaintenance' );
diff --git a/maintenance/includes/SevenZipStream.php b/maintenance/includes/SevenZipStream.php
index 7b6a27849b72..a133c5f01832 100644
--- a/maintenance/includes/SevenZipStream.php
+++ b/maintenance/includes/SevenZipStream.php
@@ -24,6 +24,8 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 use MediaWiki\Shell\Shell;
 
 /**
@@ -105,3 +107,6 @@ class SevenZipStream {
 		return fseek( $this->stream, $offset, $whence );
 	}
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( SevenZipStream::class, 'SevenZipStream' );
diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php
index 9fd87111e835..c0c26b064ba3 100644
--- a/maintenance/includes/TextPassDumper.php
+++ b/maintenance/includes/TextPassDumper.php
@@ -25,11 +25,16 @@
  * @ingroup Maintenance
  */
 
+namespace MediaWiki\Maintenance;
+
 // @codeCoverageIgnoreStart
 require_once __DIR__ . '/BackupDumper.php';
 require_once __DIR__ . '/../../includes/export/WikiExporter.php';
 // @codeCoverageIgnoreEnd
 
+use BaseDump;
+use Exception;
+use ExportProgressFilter;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Settings\SettingsBuilder;
 use MediaWiki\Shell\Shell;
@@ -38,8 +43,13 @@ use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWiki\WikiMap\WikiMap;
 use MediaWiki\Xml\Xml;
+use MWException;
+use MWUnknownContentModelException;
+use RuntimeException;
+use WikiExporter;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
+use XmlDumpWriter;
 
 /**
  * @ingroup Maintenance
@@ -1081,3 +1091,6 @@ TEXT
 	}
 
 }
+
+/** @deprecated class alias since 1.43 */
+class_alias( TextPassDumper::class, 'TextPassDumper' );