X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FSqliteInstaller.php;h=d5909f4e1fb4f3b45a7427ad211a0f5ea19caa07;hb=5c28dd51ebfe07232b9d082812b64445dcc5f207;hp=0f639badd8c512d4b55cfa87578e6250a11425f6;hpb=5ff347bb044057d3cc560e860c85af26163bc979;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php index 0f639badd8..d5909f4e1f 100644 --- a/includes/installer/SqliteInstaller.php +++ b/includes/installer/SqliteInstaller.php @@ -33,7 +33,8 @@ use Wikimedia\Rdbms\DBConnectionError; */ class SqliteInstaller extends DatabaseInstaller { - public $minimumVersion = '3.3.7'; + public static $minimumVersion = '3.3.7'; + protected static $notMiniumumVerisonMessage = 'config-outdated-sqlite'; /** * @var DatabaseSqlite @@ -58,12 +59,9 @@ class SqliteInstaller extends DatabaseInstaller { * @return Status */ public function checkPrerequisites() { - $result = Status::newGood(); // Bail out if SQLite is too old $db = DatabaseSqlite::newStandaloneInstance( ':memory:' ); - if ( version_compare( $db->getServerVersion(), $this->minimumVersion, '<' ) ) { - $result->fatal( 'config-outdated-sqlite', $db->getServerVersion(), $this->minimumVersion ); - } + $result = static::meetsMinimumRequirement( $db->getServerVersion() ); // Check for FTS3 full-text search module if ( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) { $result->warning( 'config-no-fts3' ); @@ -267,8 +265,8 @@ EOT; } /** - * @param $dir - * @param $db + * @param string $dir + * @param string $db * @return Status */ protected function makeStubDBFile( $dir, $db ) { @@ -296,7 +294,7 @@ EOT; } /** - * @param Status $status + * @param Status &$status * @return Status */ public function setupSearchIndex( &$status ) {