* Adapt install.php to a more “traditional” maintenance-style script so it can extend...

* Add CliInstaller class and put it in the autoloads.

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 2c4598d..4732d77 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -413,6 +413,7 @@ $wgAutoloadLocalClasses = array(
        'UnregisteredLocalFile' => 'includes/filerepo/UnregisteredLocalFile.php',
 
        # includes/installer
+       'CliInstaller' => 'includes/installer/CliInstaller.php',
        'Installer' => 'includes/installer/Installer.php',
        'InstallerDBType' => 'includes/installer/InstallerDBType.php',
        'LBFactory_InstallerFake' => 'includes/installer/Installer.php',

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
new file mode 100644 (file)
index 0000000..307762e
--- /dev/null
+++ b/includes/installer/CliInstaller.php
@@ -0,0 +1,52 @@
+<?php
+
+function wfInstallerConfig() {
+       // Don't access the database
+       $GLOBALS['wgUseDatabaseMessages'] = false;
+       // Debug-friendly
+       $GLOBALS['wgShowExceptionDetails'] = true;
+       // Don't break forms
+       $GLOBALS['wgExternalLinkTarget'] = '_blank';
+
+       // Extended debugging. Maybe disable before release?
+       $GLOBALS['wgShowSQLErrors'] = true;
+       $GLOBALS['wgShowDBErrorBacktrace'] = true;
+}
+
+class CliInstaller extends Installer {
+
+       /** Constructor */
+       function __construct( $siteName, $admin = null, $option = array()) {
+               parent::__construct();
+
+               if ( isset( $option['lang'] ) ) {
+                       global $wgLang, $wgContLang, $wgLanguageCode;
+                       $this->setVar( '_UserLang', $option['lang'] );
+                       $wgContLang = Language::factory( $option['lang'] );
+                       $wgLang = Language::factory( $option['lang'] );
+                       $wgLanguageCode = $option['lang'];
+               }
+
+               $this->setVar( 'wgSitename', $siteName );
+               if ( $admin ) {
+                       $this->setVar( '_AdminName', $admin );
+               } else {
+                       $this->setVar( '_AdminName', wfMsgForContent( 'config-admin-default-username' ) );
+               }
+       }
+
+       /**
+        * Main entry point.
+        */
+       function execute( ) {
+               var_dump($this->getVar('_AdminName'));
+       }
+
+       function showMessage( $msg /*, ... */ ) {
+               echo "Message: $msg\n";
+       }
+
+       function showStatusError( $status ) {
+               echo "Error: $status\n";
+       }
+}

diff --git a/maintenance/install.php b/maintenance/install.php
index 96afcf7..d68ae27 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -1,49 +1,58 @@
 <?php
 
-if ( php_sapi_name() != 'cli' ) {
-       echo "This is a command-line script.\n";
-       exit( 1 );
-}
+/**
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup Maintenance
+ * @see wfWaitForSlaves()
+ */
 
-define( 'MEDIAWIKI', 1 );
 define( 'MW_NO_DB', 1 );
 define( 'MW_NO_SESSION', 1 );
 define( 'MW_CONFIG_CALLBACK', 'wfInstallerConfig' );
 
 $IP = dirname( dirname( __FILE__ ) );
 
-function wfInstallerConfig() {
-       // Don't access the database
-       $GLOBALS['wgUseDatabaseMessages'] = false;
-       // Debug-friendly
-       $GLOBALS['wgShowExceptionDetails'] = true;
-       // Don't break forms
-       $GLOBALS['wgExternalLinkTarget'] = '_blank';
+require_once( "$IP/maintenance/Maintenance.php" );
+
+class CommandLineInstaller extends Maintenance {
+       public function __construct() {
+               $this->addArg( 'name', 'The name of the wiki', true);
+               $this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', false);
+               $this->addOption( 'pass', 'The password for the wiki administrator.  You will be prompted for this if it isn\'t provided', false, true);
+               /* $this->addOption( 'email', 'The email for the wiki administrator', false, true); */
+               $this->addOption( 'lang', 'The language to use (en)', false, true );
+               /* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */
+               $this->addOption( 'db-type', 'The type of database (mysql)', false, true );
+               /* $this->addOption( 'db-host', 'The database host (localhost)', false, true ); */
+               /* $this->addOption( 'db-port', 'The database port (3306 for mysql, 5432 for pg)', false, true ); */
+               $this->addOption( 'db-name', 'The database name (my_wiki)', false, true );
+               $this->addOption( 'db-path', 'The path for the SQLite DB (/var/data)', false, true );
+               /* $this->addOption( 'db-schema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */
+               /* $this->addOption( 'db-tsearch2-schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */
+               /* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */
+       }
+
+       public function execute() {
+               $installer = new CliInstaller( $this->mArgs[0], $this->mArgs[1], $this->mOptions );
+
+               $installer->execute();
+       }
 }
 
-require_once( "$IP/includes/ProfilerStub.php" );
-require_once( "$IP/includes/Defines.php" );
-require_once( "$IP/includes/GlobalFunctions.php" );
-require_once( "$IP/includes/AutoLoader.php" );
-require_once( "$IP/includes/Hooks.php" );
-require_once( "$IP/includes/DefaultSettings.php" );
-require_once( "$IP/includes/Namespace.php" );
-
-$wgContLang = Language::factory( 'en' ); // will be overridden later
-
-// Disable the i18n cache and LoadBalancer
-Language::getLocalisationCache()->disableBackend();
-LBFactory::disableBackend();
-
-$installer = new CliInstaller( $argv );
-
-$langCode = 'en';
-
-$wgLang = Language::factory( $langCode );
-
-$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
-
-$session = $installer->execute( $argv );
-
-$_SESSION['installData'] = $session;
+$maintClass = "CommandLineInstaller";
 
+require_once( DO_MAINTENANCE );