X-Git-Url: https://git.heureux-cyclage.org/w/index.php?a=blobdiff_plain;f=includes%2Finstaller%2FOracleInstaller.php;h=05f078fab7bddc1cc1aa595151849e4a156ae313;hb=86b4925b2edfddf00c9184bcd24be34f33fa4607;hp=14683d6c46d43a07aa77f8c511840a4008338335;hpb=2dd58ade75d15a5895c0c010e17b6f729a0f72fe;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 14683d6c46..05f078fab7 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -21,6 +21,7 @@ * @ingroup Deployment */ +use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\DBConnectionError; /** @@ -45,7 +46,8 @@ class OracleInstaller extends DatabaseInstaller { '_InstallUser' => 'SYSTEM', ]; - public $minimumVersion = '9.0.1'; // 9iR1 + public static $minimumVersion = '9.0.1'; // 9iR1 + protected static $notMiniumumVerisonMessage = 'config-oracle-old'; protected $connError = null; @@ -152,15 +154,12 @@ class OracleInstaller extends DatabaseInstaller { } /** - * @var $conn Database + * @var Database $conn */ $conn = $status->value; // Check version - $version = $conn->getServerVersion(); - if ( version_compare( $version, $this->minimumVersion ) < 0 ) { - return Status::newFatal( 'config-oracle-old', $this->minimumVersion, $version ); - } + $status->merge( static::meetsMinimumRequirement( $conn->getServerVersion() ) ); return $status; }