Merge "Remove check for PHP version in install.php"

diff --combined maintenance/install.php
index 9a73f2e,47114fd..b948b67
--- 1/maintenance/install.php
--- 2/maintenance/install.php
+++ b/maintenance/install.php
@@@ -21,21 -21,17 +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
@@@ -86,11 -82,9 +83,11 @@@ class CommandLineInstaller extends Main
                        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" );
        }