Move minimum database versions to Defines.php

diff --git a/includes/Defines.php b/includes/Defines.php
index 3ca7dcb..770f569 100644 (file)
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -23,6 +23,9 @@ define( 'MW_SPECIALPAGE_VERSION', 2 );
  */
 define( 'MW_MIN_PHP_VERSION', '5.2.3' );
 
+define( 'MW_MIN_MYSQL_VERSION', '4.0.14' );
+define( 'MW_MIN_ORACLE_VERSION', '9.0.1' );
+
 /**@}*/
 
 /**@{

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 5046df3..fb96e32 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -31,8 +31,6 @@ class MysqlInstaller extends DatabaseInstaller {
 
        public $supportedEngines = array( 'InnoDB', 'MyISAM' );
 
-       public $minimumVersion = '4.0.14';
-
        public $webUserPrivs = array(
                'DELETE',
                'INSERT',
@@ -104,8 +102,8 @@ class MysqlInstaller extends DatabaseInstaller {
 
                // Check version
                $version = $conn->getServerVersion();
-               if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
-                       return Status::newFatal( 'config-mysql-old', $this->minimumVersion, $version );
+               if ( version_compare( $version, MW_MIN_MYSQL_VERSION ) < 0 ) {
+                       return Status::newFatal( 'config-mysql-old', MW_MIN_MYSQL_VERSION, $version );
                }
 
                return $status;

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 8575830..77442a6 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -26,8 +26,6 @@ class OracleInstaller extends DatabaseInstaller {
                '_OracleDefTS' => 'USERS',
                '_OracleTempTS' => 'TEMP'
        );
-       
-       public $minimumVersion = '9.0.1'; // 9iR1
 
        protected $connError = null;
 
@@ -120,8 +118,8 @@ class OracleInstaller extends DatabaseInstaller {
 
                // Check version
                $version = $conn->getServerVersion();
-               if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
-                       return Status::newFatal( 'config-oracle-old', $this->minimumVersion, $version );
+               if ( version_compare( $version, MW_MIN_ORACLE_VERSION ) < 0 ) {
+                       return Status::newFatal( 'config-oracle-old', MW_MIN_ORACLE_VERSION, $version );
                }
 
                return $status;