Remove underscore from classes WebInstaller_*

Part of program to remove underscores from class names. Checked core and
675 extensions for occurrences. All uses are in core in core are updated
in this patch. There are no uses in Gerrit extensions.

Change-Id: I6150c2d3f5a18496da5bcdcadc5d8982b70bec7a

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 439e5f5..05e2ae7 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -78,6 +78,22 @@ changes to languages because of Bugzilla reports.
 * RevDel_LogList to RevDelLogList
 * RevDel_RevisionItem to RevDelRevisionItem
 * RevDel_RevisionList to RevDelRevisionList
+* WebInstaller_Complete to WebInstallerComplete
+* WebInstaller_Copying to WebInstallerCopying
+* WebInstaller_DBConnect to WebInstallerDBConnect
+* WebInstaller_DBSettings to WebInstallerDBSettings
+* WebInstaller_Document to WebInstallerDocument
+* WebInstaller_ExistingWiki to WebInstallerExistingWiki
+* WebInstaller_Install to WebInstallerInstall
+* WebInstaller_Language to WebInstallerLanguage
+* WebInstaller_Name to WebInstallerName
+* WebInstaller_Options to WebInstallerOptions
+* WebInstaller_Readme to WebInstallerReadme
+* WebInstaller_ReleaseNotes to WebInstallerReleaseNotes
+* WebInstaller_Restart to WebInstallerRestart
+* WebInstaller_Upgrade to WebInstallerUpgrade
+* WebInstaller_UpgradeDoc to WebInstallerUpgradeDoc
+* WebInstaller_Welcome to WebInstallerWelcome
 
 ==== Removed classes ====
 * IPBlockForm - Use SpecialBlock directly

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 6c413c0..515386c 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -622,22 +622,22 @@ $wgAutoloadLocalClasses = array(
        'SqliteInstaller' => 'includes/installer/SqliteInstaller.php',
        'SqliteUpdater' => 'includes/installer/SqliteUpdater.php',
        'WebInstaller' => 'includes/installer/WebInstaller.php',
-       'WebInstaller_Complete' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Copying' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_DBConnect' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_DBSettings' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Document' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_ExistingWiki' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Install' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Language' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Name' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Options' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Readme' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_ReleaseNotes' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Restart' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Upgrade' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_UpgradeDoc' => 'includes/installer/WebInstallerPage.php',
-       'WebInstaller_Welcome' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerComplete' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerCopying' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerDBConnect' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerDBSettings' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerDocument' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerExistingWiki' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerInstall' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerLanguage' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerName' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerOptions' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerReadme' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerReleaseNotes' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerRestart' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerUpgrade' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerUpgradeDoc' => 'includes/installer/WebInstallerPage.php',
+       'WebInstallerWelcome' => 'includes/installer/WebInstallerPage.php',
        'WebInstallerOutput' => 'includes/installer/WebInstallerOutput.php',
        'WebInstallerPage' => 'includes/installer/WebInstallerPage.php',
 

diff --git a/includes/db/Database.php b/includes/db/Database.php
index f7fe980..286f8b0 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -806,7 +806,7 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
         * database. Example uses in core:
         * @see LoadBalancer::reallyOpenConnection()
         * @see ForeignDBRepo::getMasterDB()
-        * @see WebInstaller_DBConnect::execute()
+        * @see WebInstallerDBConnect::execute()
         *
         * @since 1.18
         *

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index d897507..2bdcbbc 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -61,7 +61,7 @@ class WebInstaller extends Installer {
         * To add a new installer page:
         *    * Add it to this WebInstaller::$pageSequence property
         *    * Add a "config-page-<name>" message
-        *    * Add a "WebInstaller_<name>" class
+        *    * Add a "WebInstaller<name>" class
         *
         * @var string[]
         */
@@ -462,7 +462,7 @@ class WebInstaller extends Installer {
         * @return WebInstallerPage
         */
        public function getPageByName( $pageName ) {
-               $pageClass = 'WebInstaller_' . $pageName;
+               $pageClass = 'WebInstaller' . $pageName;
 
                return new $pageClass( $this );
        }

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 4de7f06..8eaf48f 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -133,7 +133,7 @@ abstract class WebInstallerPage {
         * @return string
         */
        public function getName() {
-               return str_replace( 'WebInstaller_', '', get_class( $this ) );
+               return str_replace( 'WebInstaller', '', get_class( $this ) );
        }
 
        /**
@@ -205,7 +205,7 @@ abstract class WebInstallerPage {
 
 }
 
-class WebInstaller_Language extends WebInstallerPage {
+class WebInstallerLanguage extends WebInstallerPage {
 
        /**
         * @return string|null
@@ -306,7 +306,7 @@ class WebInstaller_Language extends WebInstallerPage {
 
 }
 
-class WebInstaller_ExistingWiki extends WebInstallerPage {
+class WebInstallerExistingWiki extends WebInstallerPage {
 
        /**
         * @return string
@@ -470,7 +470,7 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
 
 }
 
-class WebInstaller_Welcome extends WebInstallerPage {
+class WebInstallerWelcome extends WebInstallerPage {
 
        /**
         * @return string
@@ -499,7 +499,7 @@ class WebInstaller_Welcome extends WebInstallerPage {
 
 }
 
-class WebInstaller_DBConnect extends WebInstallerPage {
+class WebInstallerDBConnect extends WebInstallerPage {
 
        /**
         * @return string|null When string, "skip" or "continue"
@@ -600,7 +600,7 @@ class WebInstaller_DBConnect extends WebInstallerPage {
 
 }
 
-class WebInstaller_Upgrade extends WebInstallerPage {
+class WebInstallerUpgrade extends WebInstallerPage {
 
        /**
         * @return bool Always true.
@@ -691,7 +691,7 @@ class WebInstaller_Upgrade extends WebInstallerPage {
 
 }
 
-class WebInstaller_DBSettings extends WebInstallerPage {
+class WebInstallerDBSettings extends WebInstallerPage {
 
        /**
         * @return string|null
@@ -725,7 +725,7 @@ class WebInstaller_DBSettings extends WebInstallerPage {
 
 }
 
-class WebInstaller_Name extends WebInstallerPage {
+class WebInstallerName extends WebInstallerPage {
 
        /**
         * @return string
@@ -941,7 +941,7 @@ class WebInstaller_Name extends WebInstallerPage {
 
 }
 
-class WebInstaller_Options extends WebInstallerPage {
+class WebInstallerOptions extends WebInstallerPage {
 
        /**
         * @return string|null
@@ -1310,7 +1310,7 @@ class WebInstaller_Options extends WebInstallerPage {
 
 }
 
-class WebInstaller_Install extends WebInstallerPage {
+class WebInstallerInstall extends WebInstallerPage {
 
        /**
         * @return bool Always true.
@@ -1385,7 +1385,7 @@ class WebInstaller_Install extends WebInstallerPage {
 
 }
 
-class WebInstaller_Complete extends WebInstallerPage {
+class WebInstallerComplete extends WebInstallerPage {
 
        public function execute() {
                // Pop up a dialog box, to make it difficult for the user to forget
@@ -1423,7 +1423,7 @@ class WebInstaller_Complete extends WebInstallerPage {
 
 }
 
-class WebInstaller_Restart extends WebInstallerPage {
+class WebInstallerRestart extends WebInstallerPage {
 
        /**
         * @return string|null
@@ -1449,7 +1449,7 @@ class WebInstaller_Restart extends WebInstallerPage {
 
 }
 
-abstract class WebInstaller_Document extends WebInstallerPage {
+abstract class WebInstallerDocument extends WebInstallerPage {
 
        /**
         * @return string
@@ -1478,7 +1478,7 @@ abstract class WebInstaller_Document extends WebInstallerPage {
 
 }
 
-class WebInstaller_Readme extends WebInstaller_Document {
+class WebInstallerReadme extends WebInstallerDocument {
 
        /**
         * @return string
@@ -1489,7 +1489,7 @@ class WebInstaller_Readme extends WebInstaller_Document {
 
 }
 
-class WebInstaller_ReleaseNotes extends WebInstaller_Document {
+class WebInstallerReleaseNotes extends WebInstallerDocument {
 
        /**
         * @throws MWException
@@ -1507,7 +1507,7 @@ class WebInstaller_ReleaseNotes extends WebInstaller_Document {
 
 }
 
-class WebInstaller_UpgradeDoc extends WebInstaller_Document {
+class WebInstallerUpgradeDoc extends WebInstallerDocument {
 
        /**
         * @return string
@@ -1518,7 +1518,7 @@ class WebInstaller_UpgradeDoc extends WebInstaller_Document {
 
 }
 
-class WebInstaller_Copying extends WebInstaller_Document {
+class WebInstallerCopying extends WebInstallerDocument {
 
        /**
         * @return string

diff --git a/skins/common/config.css b/skins/common/config.css
index e1f7a83..8b3cbd8 100644 (file)
--- a/skins/common/config.css
+++ b/skins/common/config.css
@@ -130,7 +130,7 @@
 
 .config-cc-wrapper {
        clear: left;
-       /* If you change this height, also change it in WebInstaller_Options::submitCC() */
+       /* If you change this height, also change it in WebInstallerOptions::submitCC() */
        height: 54em;
 }