From: Reedy Date: Mon, 16 Apr 2012 14:23:41 +0000 (+0100) Subject: Various updates needed to bump min php version to 5.3.2 X-Git-Tag: 1.31.0-rc.0~23740^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f1bec81eba7e59578b4a384b3c5555cfcd33f5fc;p=lhc%2Fweb%2Fwiklou.git Various updates needed to bump min php version to 5.3.2 Change-Id: I22015387e4ac5839a907059086d787f352746886 --- diff --git a/INSTALL b/INSTALL index 3a2860fe1a..c4bb8be987 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Starting with MediaWiki 1.2.0, it's possible to install and configure the wiki "in-place", as long as you have the necessary prerequisites available. Required software: -* Web server with PHP 5.2.3 or higher. +* Web server with PHP 5.3.2 or higher. * A SQL server, the following types are supported ** MySQL 5.0.2 or higher ** PostgreSQL 8.3 or higher diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index 07145ae4cc..5e8d315f07 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -10,6 +10,10 @@ THIS IS NOT A RELEASE YET MediaWiki 1.20 is an alpha-quality branch and is not recommended for use in production. +=== PHP 5.3 now required == +Since 1.20, the lowest supported version of MediaWiki is now 5.3.2. Please +upgrade PHP if you have not done so prior to upgrading MediaWiki. + === Configuration changes in 1.20 === * `$wgUsePathInfo = true;` is no longer needed to make $wgArticlePath work on servers using like nginx, lighttpd, and apache over fastcgi. MediaWiki now always extracts @@ -112,7 +116,7 @@ changes to languages because of Bugzilla reports. == Compatibility == -MediaWiki 1.20 requires PHP 5.2.3. PHP 4 is no longer supported. +MediaWiki 1.20 requires PHP 5.3.2. PHP 4 is no longer supported. MySQL is the recommended DBMS. PostgreSQL or SQLite can also be used, but support for them is somewhat less mature. There is experimental support for IBM diff --git a/api.php b/api.php index 889c5f10a2..3691ac6457 100644 --- a/api.php +++ b/api.php @@ -38,7 +38,7 @@ define( 'MW_API', true ); // Bail if PHP is too low -if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ) { +if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); wfPHPVersionError( 'api.php' ); } diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index b380787db8..9e8c61daaf 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -24,7 +24,7 @@ abstract class Installer { // This is the absolute minimum PHP version we can support - const MINIMUM_PHP_VERSION = '5.2.3'; + const MINIMUM_PHP_VERSION = '5.3.2'; /** * @var array diff --git a/index.php b/index.php index e14823af1b..201087847a 100644 --- a/index.php +++ b/index.php @@ -40,7 +40,7 @@ # has structures (try/catch, foo()->bar(), etc etc) which throw parse errors in # PHP 4. Setup.php and ObjectCache.php have structures invalid in PHP 5.0 and # 5.1, respectively. -if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ) { +if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); wfPHPVersionError( 'index.php' ); } diff --git a/load.php b/load.php index 6e829713a8..2fa637a8ea 100644 --- a/load.php +++ b/load.php @@ -24,7 +24,7 @@ */ // Bail if PHP is too low -if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ) { +if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); wfPHPVersionError( 'load.php' ); } diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 5d76cdffb8..232c4f364f 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -32,7 +32,7 @@ define( 'DO_MAINTENANCE', RUN_MAINTENANCE_IF_MAIN ); // original name, harmless $maintClass = false; // Make sure we're on PHP5 or better -if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.2.3' ) < 0 ) { +if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) { require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' ); wfPHPVersionError( 'cli' ); } diff --git a/maintenance/install.php b/maintenance/install.php index 9a408aa630..96a65fcee9 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -20,8 +20,8 @@ * @see wfWaitForSlaves() */ -if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) { - echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" . +if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) { + echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.3.2 or higher. ABORTING.\n" . "Check if you have a newer php executable with a different name, such as php5.\n"; die( 1 ); } diff --git a/maintenance/update.php b/maintenance/update.php index c4bf3b22da..741ec90d5a 100644 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -25,8 +25,8 @@ * @ingroup Maintenance */ -if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.2.3' ) < 0 ) ) { - echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.2.3 or higher. ABORTING.\n" . +if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) { + echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.3.2 or higher. ABORTING.\n" . "Check if you have a newer php executable with a different name, such as php5.\n"; die( 1 ); }