installer: Namespace remaining classes

Change-Id: I11a8df30a2117ef29a4ade25f1082f25eb18490a

17 files changed, 105 insertions, 19 deletions

diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42
index 8dd359b1a33b..cbef1b5fc1d8 100644
--- a/RELEASE-NOTES-1.42
+++ b/RELEASE-NOTES-1.42
@@ -252,11 +252,17 @@ because of Phabricator reports.
 * Installer related classes have been namespaced without having aliases added.
   The following have been moved to MediaWiki\Installer:
   - CliInstaller
+  - DatabaseInstaller
   - InstallDocFormatter
   - Installer
   - InstallerOverrides
   - InstallerSessionProvider
   - LocalSettingsGenerator
+  - MysqlInstaller
+  - PostgresInstaller
+  - PostgresUpdater
+  - SqliteInstaller
+  - SqliteUpdater
   - WebInstaller
   - WebInstallerComplete
   - WebInstallerCopying
@@ -315,6 +321,9 @@ because of Phabricator reports.
     - TransactionRoundDefiningUpdate
     - UserEditCountInfo
     - UserEditCountUpdate
+  - MediaWiki\Installer:
+    - DatabaseUpdater
+    - MysqlUpdater
   - MediaWiki\Parser:
     - ParserOutput
   - MediaWiki\PoolCounter:
diff --git a/autoload.php b/autoload.php
index 5bf7710ac79c..e8c591278387 100644
--- a/autoload.php
+++ b/autoload.php
@@ -330,7 +330,6 @@ $wgAutoloadLocalClasses = [
 	'DBTransactionSizeError' => __DIR__ . '/includes/libs/rdbms/exception/DBTransactionSizeError.php',
 	'DBUnexpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBUnexpectedError.php',
 	'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
-	'DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
 	'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
 	'DatabaseLogEntry' => __DIR__ . '/includes/logging/DatabaseLogEntry.php',
 	'DatabaseMysqlBase' => __DIR__ . '/includes/libs/rdbms/database/DatabaseMySQL.php',
@@ -1486,6 +1485,8 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Http\\MwHttpRequestToResponseInterfaceAdapter' => __DIR__ . '/includes/http/MwHttpRequestToResponseInterfaceAdapter.php',
 	'MediaWiki\\Http\\Telemetry' => __DIR__ . '/includes/http/Telemetry.php',
 	'MediaWiki\\Installer\\CliInstaller' => __DIR__ . '/includes/installer/CliInstaller.php',
+	'MediaWiki\\Installer\\DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
+	'MediaWiki\\Installer\\DatabaseUpdater' => __DIR__ . '/includes/installer/DatabaseUpdater.php',
 	'MediaWiki\\Installer\\Hook\\LoadExtensionSchemaUpdatesHook' => __DIR__ . '/includes/installer/Hook/LoadExtensionSchemaUpdatesHook.php',
 	'MediaWiki\\Installer\\InstallDocFormatter' => __DIR__ . '/includes/installer/InstallDocFormatter.php',
 	'MediaWiki\\Installer\\InstallException' => __DIR__ . '/includes/installer/InstallException.php',
@@ -1493,7 +1494,13 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Installer\\InstallerOverrides' => __DIR__ . '/includes/installer/InstallerOverrides.php',
 	'MediaWiki\\Installer\\InstallerSessionProvider' => __DIR__ . '/includes/installer/InstallerSessionProvider.php',
 	'MediaWiki\\Installer\\LocalSettingsGenerator' => __DIR__ . '/includes/installer/LocalSettingsGenerator.php',
+	'MediaWiki\\Installer\\MysqlInstaller' => __DIR__ . '/includes/installer/MysqlInstaller.php',
+	'MediaWiki\\Installer\\MysqlUpdater' => __DIR__ . '/includes/installer/MysqlUpdater.php',
 	'MediaWiki\\Installer\\Pingback' => __DIR__ . '/includes/installer/Pingback.php',
+	'MediaWiki\\Installer\\PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
+	'MediaWiki\\Installer\\PostgresUpdater' => __DIR__ . '/includes/installer/PostgresUpdater.php',
+	'MediaWiki\\Installer\\SqliteInstaller' => __DIR__ . '/includes/installer/SqliteInstaller.php',
+	'MediaWiki\\Installer\\SqliteUpdater' => __DIR__ . '/includes/installer/SqliteUpdater.php',
 	'MediaWiki\\Installer\\WebInstaller' => __DIR__ . '/includes/installer/WebInstaller.php',
 	'MediaWiki\\Installer\\WebInstallerComplete' => __DIR__ . '/includes/installer/WebInstallerComplete.php',
 	'MediaWiki\\Installer\\WebInstallerCopying' => __DIR__ . '/includes/installer/WebInstallerCopying.php',
@@ -2450,7 +2457,6 @@ $wgAutoloadLocalClasses = [
 	'MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
 	'MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
 	'MwSql' => __DIR__ . '/maintenance/sql.php',
-	'MysqlInstaller' => __DIR__ . '/includes/installer/MysqlInstaller.php',
 	'MysqlMaintenance' => __DIR__ . '/maintenance/mysql.php',
 	'MysqlUpdater' => __DIR__ . '/includes/installer/MysqlUpdater.php',
 	'NaiveForeignTitleFactory' => __DIR__ . '/includes/title/NaiveForeignTitleFactory.php',
@@ -2550,8 +2556,6 @@ $wgAutoloadLocalClasses = [
 	'PopulateRecentChangesSource' => __DIR__ . '/maintenance/populateRecentChangesSource.php',
 	'PopulateRevisionLength' => __DIR__ . '/maintenance/populateRevisionLength.php',
 	'PopulateRevisionSha1' => __DIR__ . '/maintenance/populateRevisionSha1.php',
-	'PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
-	'PostgresUpdater' => __DIR__ . '/includes/installer/PostgresUpdater.php',
 	'PreferencesFormOOUI' => __DIR__ . '/includes/specials/forms/PreferencesFormOOUI.php',
 	'PrefixSearch' => __DIR__ . '/includes/search/PrefixSearch.php',
 	'PrefixingStatsdDataFactoryProxy' => __DIR__ . '/includes/libs/Stats/PrefixingStatsdDataFactoryProxy.php',
@@ -2900,9 +2904,7 @@ $wgAutoloadLocalClasses = [
 	'SqlSearchResult' => __DIR__ . '/includes/search/SqlSearchResult.php',
 	'SqlSearchResultSet' => __DIR__ . '/includes/search/SqlSearchResultSet.php',
 	'Sqlite' => __DIR__ . '/maintenance/Sqlite.php',
-	'SqliteInstaller' => __DIR__ . '/includes/installer/SqliteInstaller.php',
 	'SqliteMaintenance' => __DIR__ . '/maintenance/SqliteMaintenance.php',
-	'SqliteUpdater' => __DIR__ . '/includes/installer/SqliteUpdater.php',
 	'SrConverter' => __DIR__ . '/includes/language/converters/SrConverter.php',
 	'StatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'StatsdAwareInterface' => __DIR__ . '/includes/libs/Stats/StatsdAwareInterface.php',
diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 0ce089296243..621c100101be 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DBMS-specific installation helper.
  *
@@ -21,9 +22,12 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use Exception;
 use MediaWiki\Html\Html;
-use MediaWiki\Installer\WebInstaller;
 use MediaWiki\Status\Status;
+use MWException;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 73746c428c2c..d7c7b500ac50 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -21,14 +21,38 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use AddRFCandPMIDInterwiki;
+use AutoLoader;
+use CleanupEmptyCategories;
+use DeleteDefaultMessages;
+use Exception;
+use ExtensionRegistry;
+use FakeMaintenance;
+use FixDefaultJsonContentPages;
+use LogicException;
+use Maintenance;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\HookContainer\StaticHookRegistry;
-use MediaWiki\Installer\Installer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\ResourceLoader\MessageBlobStore;
 use MediaWiki\SiteStats\SiteStatsInit;
+use MigrateLinksTable;
+use MWException;
+use PopulateBacklinkNamespace;
+use PopulateFilearchiveSha1;
+use PopulateImageSha1;
+use PopulateIpChanges;
+use PopulatePPSortKey;
+use PopulateRevisionLength;
+use PopulateRevisionSha1;
+use RebuildLocalisationCache;
+use RefreshImageMetadata;
+use RuntimeException;
+use UpdateCollation;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
@@ -228,7 +252,7 @@ abstract class DatabaseUpdater {
 	) {
 		$type = $db->getType();
 		if ( in_array( $type, Installer::getDBTypes() ) ) {
-			$class = ucfirst( $type ) . 'Updater';
+			$class = '\\MediaWiki\\Installer\\' . ucfirst( $type ) . 'Updater';
 
 			return new $class( $db, $shared, $maintenance );
 		}
@@ -1324,3 +1348,8 @@ abstract class DatabaseUpdater {
 	}
 
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( DatabaseUpdater::class, 'DatabaseUpdater' );
diff --git a/includes/installer/Hook/LoadExtensionSchemaUpdatesHook.php b/includes/installer/Hook/LoadExtensionSchemaUpdatesHook.php
index d41159ce539d..8630701027ee 100644
--- a/includes/installer/Hook/LoadExtensionSchemaUpdatesHook.php
+++ b/includes/installer/Hook/LoadExtensionSchemaUpdatesHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Installer\Hook;
 
-use DatabaseUpdater;
+use MediaWiki\Installer\DatabaseUpdater;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 4c13551d61f1..aca0a521b1dc 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -27,7 +27,6 @@
 namespace MediaWiki\Installer;
 
 use AutoLoader;
-use DatabaseInstaller;
 use EmptyBagOStuff;
 use Exception;
 use ExecutableFinder;
@@ -645,7 +644,7 @@ abstract class Installer {
 	 * @since 1.30
 	 */
 	public static function getDBInstallerClass( $type ) {
-		return ucfirst( $type ) . 'Installer';
+		return '\\MediaWiki\\Installer\\' . ucfirst( $type ) . 'Installer';
 	}
 
 	/**
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index a1e8fe7b97f0..71f80a2c9f3a 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * MySQL-specific installer.
  *
@@ -21,8 +22,9 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Html\Html;
-use MediaWiki\Installer\LocalSettingsGenerator;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\Database;
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 2619a1b79e4c..91358c5fd643 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * MySQL-specific updater.
  *
@@ -21,12 +22,20 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use FixInconsistentRedirects;
+use MigrateExternallinks;
+use MigrateRevisionActorTemp;
+use MigrateRevisionCommentTemp;
+use UpdateRestrictions;
+
 /**
  * Mysql update list and mysql-specific update functions.
  *
  * @ingroup Installer
  * @since 1.17
- * @property Wikimedia\Rdbms\DatabaseMySQL $db
+ * @property \Wikimedia\Rdbms\DatabaseMySQL $db
  */
 class MysqlUpdater extends DatabaseUpdater {
 	protected function getCoreUpdateList() {
@@ -288,3 +297,8 @@ class MysqlUpdater extends DatabaseUpdater {
 	}
 
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( MysqlUpdater::class, 'MysqlUpdater' );
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 0ecef712f5e3..9c53201be17e 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -21,9 +21,12 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
+use MWException;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseFactory;
 use Wikimedia\Rdbms\DatabasePostgres;
diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index ad2805f4ab4b..487026899a73 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -21,6 +21,13 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use FixInconsistentRedirects;
+use MigrateExternallinks;
+use MigrateRevisionActorTemp;
+use MigrateRevisionCommentTemp;
+use UpdateRestrictions;
 use Wikimedia\Rdbms\DatabasePostgres;
 
 /**
diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 164cd6e7876a..260310110777 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Sqlite-specific installer.
  *
@@ -21,8 +22,8 @@
  * @ingroup Installer
  */
 
-use MediaWiki\Installer\Installer;
-use MediaWiki\Installer\LocalSettingsGenerator;
+namespace MediaWiki\Installer;
+
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
 use Wikimedia\AtEase\AtEase;
diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 1a9d51d8fea2..36ffc5c5e4ee 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Sqlite-specific updater.
  *
@@ -21,12 +22,20 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use FixInconsistentRedirects;
+use MigrateExternallinks;
+use MigrateRevisionActorTemp;
+use MigrateRevisionCommentTemp;
+use UpdateRestrictions;
+
 /**
  * Class for handling updates to Sqlite databases.
  *
  * @ingroup Installer
  * @since 1.17
- * @property Wikimedia\Rdbms\DatabaseSqlite $db
+ * @property \Wikimedia\Rdbms\DatabaseSqlite $db
  */
 class SqliteUpdater extends DatabaseUpdater {
 
diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 04f25085f7f7..2670170f12c8 100644
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -22,6 +22,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Installer\DatabaseUpdater;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 66e9d16b8070..faa5bf531a54 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -24,6 +24,7 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\Installer\DatabaseUpdater;
 use Wikimedia\Rdbms\DBQueryError;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/maintenance/update.php b/maintenance/update.php
index e9ed841b24ce..883b1231d827 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -29,6 +29,8 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\Installer\DatabaseInstaller;
+use MediaWiki\Installer\DatabaseUpdater;
 use MediaWiki\Installer\Installer;
 use MediaWiki\Settings\SettingsBuilder;
 use MediaWiki\WikiMap\WikiMap;
diff --git a/tests/parser/DbTestRecorder.php b/tests/parser/DbTestRecorder.php
index 06233c532a52..3c07497ba939 100644
--- a/tests/parser/DbTestRecorder.php
+++ b/tests/parser/DbTestRecorder.php
@@ -19,6 +19,7 @@
  * @ingroup Testing
  */
 
+use MediaWiki\Installer\DatabaseUpdater;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
 class DbTestRecorder extends TestRecorder {
diff --git a/tests/phpunit/unit/includes/installer/SqliteInstallerTest.php b/tests/phpunit/unit/includes/installer/SqliteInstallerTest.php
index 0f290d861295..fa74db13a23f 100644
--- a/tests/phpunit/unit/includes/installer/SqliteInstallerTest.php
+++ b/tests/phpunit/unit/includes/installer/SqliteInstallerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Installer\SqliteInstaller;
 use MediaWiki\Status\Status;
 
 /**
@@ -8,7 +9,7 @@ use MediaWiki\Status\Status;
  */
 class SqliteInstallerTest extends MediaWikiUnitTestCase {
 	/**
-	 * @covers SqliteInstaller::checkDataDir
+	 * @covers \MediaWiki\Installer\SqliteInstaller::checkDataDir
 	 */
 	public function testCheckDataDir() {
 		$method = new ReflectionMethod( SqliteInstaller::class, 'checkDataDir' );
@@ -38,7 +39,7 @@ class SqliteInstallerTest extends MediaWikiUnitTestCase {
 	}
 
 	/**
-	 * @covers SqliteInstaller::createDataDir
+	 * @covers \MediaWiki\Installer\SqliteInstaller::createDataDir
 	 */
 	public function testCreateDataDir() {
 		$method = new ReflectionMethod( SqliteInstaller::class, 'createDataDir' );