Namespace WebInstaller classes

Change-Id: Iac081a08681048c56b20c7789c5efb50a756d167

21 files changed, 78 insertions, 14 deletions

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 9abee95c2105..0ce089296243 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Html\Html;
+use MediaWiki\Installer\WebInstaller;
 use MediaWiki\Status\Status;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\Database;
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 48ca6e48122f..3bffbb7ce6d9 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -32,6 +32,7 @@ use MediaWiki\Config\MultiConfig;
 use MediaWiki\Deferred\SiteStatsUpdate;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
+use MediaWiki\Installer\WebInstaller;
 use MediaWiki\Interwiki\NullInterwikiLookup;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
diff --git a/includes/installer/InstallerOverrides.php b/includes/installer/InstallerOverrides.php
index ceebadc38b8d..322247095e27 100644
--- a/includes/installer/InstallerOverrides.php
+++ b/includes/installer/InstallerOverrides.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Installer\WebInstaller;
 use MediaWiki\Request\WebRequest;
 
 /**
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 22b00c83c4b5..f78fce52739d 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -21,11 +21,20 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use Exception;
+use HtmlArmor;
+use Installer;
+use InstallerOverrides;
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Status\Status;
+use Message;
+use RequestContext;
+use Xml;
 
 /**
  * Class for the core installer web interface.
diff --git a/includes/installer/WebInstallerComplete.php b/includes/installer/WebInstallerComplete.php
index 6428061776ad..0b1cc0a979ef 100644
--- a/includes/installer/WebInstallerComplete.php
+++ b/includes/installer/WebInstallerComplete.php
@@ -19,7 +19,11 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use HtmlArmor;
 use MediaWiki\Html\Html;
+use Message;
 
 class WebInstallerComplete extends WebInstallerPage {
 
diff --git a/includes/installer/WebInstallerCopying.php b/includes/installer/WebInstallerCopying.php
index 10dd331c7d85..2d9309f8f723 100644
--- a/includes/installer/WebInstallerCopying.php
+++ b/includes/installer/WebInstallerCopying.php
@@ -19,6 +19,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 class WebInstallerCopying extends WebInstallerDocument {
 
 	/**
diff --git a/includes/installer/WebInstallerDBConnect.php b/includes/installer/WebInstallerDBConnect.php
index 6fbe36501f50..db40d3176af2 100644
--- a/includes/installer/WebInstallerDBConnect.php
+++ b/includes/installer/WebInstallerDBConnect.php
@@ -1,8 +1,5 @@
 <?php
 
-use MediaWiki\Html\Html;
-use MediaWiki\Status\Status;
-
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +20,13 @@ use MediaWiki\Status\Status;
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use Installer;
+use MediaWiki\Html\Html;
+use MediaWiki\Status\Status;
+use Xml;
+
 class WebInstallerDBConnect extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerDBSettings.php b/includes/installer/WebInstallerDBSettings.php
index 214093bf5e14..1fd93811b393 100644
--- a/includes/installer/WebInstallerDBSettings.php
+++ b/includes/installer/WebInstallerDBSettings.php
@@ -19,6 +19,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 class WebInstallerDBSettings extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerDocument.php b/includes/installer/WebInstallerDocument.php
index 51b5e7412775..3b021fcdfc92 100644
--- a/includes/installer/WebInstallerDocument.php
+++ b/includes/installer/WebInstallerDocument.php
@@ -19,6 +19,10 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use InstallDocFormatter;
+
 abstract class WebInstallerDocument extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerExistingWiki.php b/includes/installer/WebInstallerExistingWiki.php
index c71208876e6b..f99e32b64c1e 100644
--- a/includes/installer/WebInstallerExistingWiki.php
+++ b/includes/installer/WebInstallerExistingWiki.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\Status\Status;
-
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +20,11 @@ use MediaWiki\Status\Status;
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use Installer;
+use MediaWiki\Status\Status;
+
 class WebInstallerExistingWiki extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerInstall.php b/includes/installer/WebInstallerInstall.php
index 0a871814eb46..0210c6e3a7eb 100644
--- a/includes/installer/WebInstallerInstall.php
+++ b/includes/installer/WebInstallerInstall.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\Status\Status;
-
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +20,10 @@ use MediaWiki\Status\Status;
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use MediaWiki\Status\Status;
+
 class WebInstallerInstall extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerLanguage.php b/includes/installer/WebInstallerLanguage.php
index b674d01c160e..afb96e1e01c4 100644
--- a/includes/installer/WebInstallerLanguage.php
+++ b/includes/installer/WebInstallerLanguage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +20,12 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\MediaWikiServices;
+use XmlSelect;
 
 class WebInstallerLanguage extends WebInstallerPage {
 
diff --git a/includes/installer/WebInstallerName.php b/includes/installer/WebInstallerName.php
index 1bf8793d7971..e94b5ae81e1b 100644
--- a/includes/installer/WebInstallerName.php
+++ b/includes/installer/WebInstallerName.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,14 +20,17 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use FormatJson;
 use MediaWiki\Config\HashConfig;
-use MediaWiki\Installer\Pingback;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserRigorOptions;
+use UserPasswordPolicy;
 
 class WebInstallerName extends WebInstallerPage {
 
diff --git a/includes/installer/WebInstallerOptions.php b/includes/installer/WebInstallerOptions.php
index f391676e6530..1767192405dc 100644
--- a/includes/installer/WebInstallerOptions.php
+++ b/includes/installer/WebInstallerOptions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +20,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Html\Html;
 use MediaWiki\Specials\SpecialVersion;
 use Wikimedia\IPUtils;
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 2d21541bd833..923484ebc633 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * Output handler for the web installer.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -21,11 +20,15 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use Language;
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\ResourceLoader\ResourceLoader;
+use MWException;
 
 /**
  * Output class modelled on OutputPage.
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 16703ff8865c..2db1c3d39bd4 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * Base code for web installer pages.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -21,7 +20,10 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Html\Html;
+use Xml;
 
 /**
  * Abstract class to define pages for the web installer.
@@ -137,6 +139,7 @@ abstract class WebInstallerPage {
 	 * @return string
 	 */
 	public function getName() {
+		// TODO: Drop namespacing here too?
 		return str_replace( 'WebInstaller', '', static::class );
 	}
 
diff --git a/includes/installer/WebInstallerReleaseNotes.php b/includes/installer/WebInstallerReleaseNotes.php
index 5eb59586c593..fda00b3f1b69 100644
--- a/includes/installer/WebInstallerReleaseNotes.php
+++ b/includes/installer/WebInstallerReleaseNotes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +20,10 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use MWException;
+
 class WebInstallerReleaseNotes extends WebInstallerDocument {
 
 	/**
diff --git a/includes/installer/WebInstallerRestart.php b/includes/installer/WebInstallerRestart.php
index ee8d481980fc..77138a8ed781 100644
--- a/includes/installer/WebInstallerRestart.php
+++ b/includes/installer/WebInstallerRestart.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\Html\Html;
-
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +20,10 @@ use MediaWiki\Html\Html;
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
+use MediaWiki\Html\Html;
+
 class WebInstallerRestart extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerUpgrade.php b/includes/installer/WebInstallerUpgrade.php
index 359606d1b3d5..23e7a93df525 100644
--- a/includes/installer/WebInstallerUpgrade.php
+++ b/includes/installer/WebInstallerUpgrade.php
@@ -19,6 +19,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 class WebInstallerUpgrade extends WebInstallerPage {
 
 	/**
diff --git a/includes/installer/WebInstallerUpgradeDoc.php b/includes/installer/WebInstallerUpgradeDoc.php
index 9aa38d7a97ef..12b972634933 100644
--- a/includes/installer/WebInstallerUpgradeDoc.php
+++ b/includes/installer/WebInstallerUpgradeDoc.php
@@ -19,6 +19,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 class WebInstallerUpgradeDoc extends WebInstallerDocument {
 
 	/**
diff --git a/includes/installer/WebInstallerWelcome.php b/includes/installer/WebInstallerWelcome.php
index 61e62f7ec82a..416e47dbbb48 100644
--- a/includes/installer/WebInstallerWelcome.php
+++ b/includes/installer/WebInstallerWelcome.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +20,8 @@
  * @ingroup Installer
  */
 
+namespace MediaWiki\Installer;
+
 use MediaWiki\Specials\SpecialVersion;
 
 class WebInstallerWelcome extends WebInstallerPage {