X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=212e42ab38682cc2422604cd6211d44c6e2c3588;hb=3c15f0d09880492e308e137518c4fadfec53bd5b;hp=3b2945225c08552c964310d7a8eb5938ef09e28e;hpb=96484126651b7f2550df5a8cc4a998d19b27b73c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/install.php b/maintenance/install.php
index 3b2945225c..212e42ab38 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -21,20 +21,18 @@
  * @ingroup Maintenance
  */
 
-if ( !function_exists( 'version_compare' ) || ( version_compare( PHP_VERSION, '5.3.2' ) < 0 ) ) {
-	require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
-	wfPHPVersionError( 'cli' );
-}
+// Checking for old versions of PHP is done in Maintenance.php
+// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
+require_once dirname( __FILE__ ) . '/Maintenance.php';
 
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-require_once dirname( __DIR__ ) . '/maintenance/Maintenance.php';
-
 /**
  * Maintenance script to install and configure MediaWiki
  *
- * Default values for the options are defined in DefaultSettings.php (see the mapping in CliInstaller.php)
+ * Default values for the options are defined in DefaultSettings.php
+ * (see the mapping in CliInstaller.php)
  * Default for --dbpath (SQLite-specific) is defined in SqliteInstaller::getGlobalDefaults
  *
  * @ingroup Maintenance
@@ -45,7 +43,7 @@ class CommandLineInstaller extends Maintenance {
 		global $IP;
 
 		$this->addDescription( "CLI-based MediaWiki installation and configuration.\n" .
-			"Defaut options are indicated in parenthesis." );
+			"Default options are indicated in parentheses." );
 
 		$this->addArg( 'name', 'The name of the wiki (MediaWiki)', false );
 
@@ -85,9 +83,11 @@ class CommandLineInstaller extends Maintenance {
 			true
 		);
 		$this->addOption( 'confpath', "Path to write LocalSettings.php to ($IP)", false, true );
-		$this->addOption( 'dbschema', 'The schema for the MediaWiki DB in PostgreSQL/Microsoft SQL Server (mediawiki)', false, true );
+		$this->addOption( 'dbschema', 'The schema for the MediaWiki DB in '
+			. 'PostgreSQL/Microsoft SQL Server (mediawiki)', false, true );
 		/*
-		$this->addOption( 'namespace', 'The project namespace (same as the "name" argument)', false, true );
+		$this->addOption( 'namespace', 'The project namespace (same as the "name" argument)',
+			false, true );
 		*/
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
 	}
@@ -104,9 +104,9 @@ class CommandLineInstaller extends Maintenance {
 				$this->error( 'WARNING: You have provided the options "dbpass" and "dbpassfile". '
 					. 'The content of "dbpassfile" overrides "dbpass".' );
 			}
-			wfSuppressWarnings();
+			MediaWiki\suppressWarnings();
 			$dbpass = file_get_contents( $dbpassfile ); // returns false on failure
-			wfRestoreWarnings();
+			MediaWiki\restoreWarnings();
 			if ( $dbpass === false ) {
 				$this->error( "Couldn't open $dbpassfile", true );
 			}
@@ -119,9 +119,9 @@ class CommandLineInstaller extends Maintenance {
 				$this->error( 'WARNING: You have provided the options "pass" and "passfile". '
 					. 'The content of "passfile" overrides "pass".' );
 			}
-			wfSuppressWarnings();
+			MediaWiki\suppressWarnings();
 			$pass = file_get_contents( $passfile ); // returns false on failure
-			wfRestoreWarnings();
+			MediaWiki\restoreWarnings();
 			if ( $pass === false ) {
 				$this->error( "Couldn't open $passfile", true );
 			}