dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mw.rcfilters.ui.MenuSelectWidget: Always open this menu downwards"
[lhc/web/wiklou.git]
/
includes
/
installer
/
SqliteInstaller.php
diff --git
a/includes/installer/SqliteInstaller.php
b/includes/installer/SqliteInstaller.php
index
3943374
..
d5909f4
100644
(file)
--- a/
includes/installer/SqliteInstaller.php
+++ b/
includes/installer/SqliteInstaller.php
@@
-32,7
+32,9
@@
use Wikimedia\Rdbms\DBConnectionError;
* @since 1.17
*/
class SqliteInstaller extends DatabaseInstaller {
* @since 1.17
*/
class SqliteInstaller extends DatabaseInstaller {
- const MINIMUM_VERSION = '3.3.7';
+
+ public static $minimumVersion = '3.3.7';
+ protected static $notMiniumumVerisonMessage = 'config-outdated-sqlite';
/**
* @var DatabaseSqlite
/**
* @var DatabaseSqlite
@@
-57,12
+59,9
@@
class SqliteInstaller extends DatabaseInstaller {
* @return Status
*/
public function checkPrerequisites() {
* @return Status
*/
public function checkPrerequisites() {
- $result = Status::newGood();
// Bail out if SQLite is too old
$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
// Bail out if SQLite is too old
$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
- if ( version_compare( $db->getServerVersion(), self::MINIMUM_VERSION, '<' ) ) {
- $result->fatal( 'config-outdated-sqlite', $db->getServerVersion(), self::MINIMUM_VERSION );
- }
+ $result = static::meetsMinimumRequirement( $db->getServerVersion() );
// Check for FTS3 full-text search module
if ( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) {
$result->warning( 'config-no-fts3' );
// Check for FTS3 full-text search module
if ( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) {
$result->warning( 'config-no-fts3' );
@@
-266,8
+265,8
@@
EOT;
}
/**
}
/**
- * @param $dir
- * @param $db
+ * @param
string
$dir
+ * @param
string
$db
* @return Status
*/
protected function makeStubDBFile( $dir, $db ) {
* @return Status
*/
protected function makeStubDBFile( $dir, $db ) {
@@
-295,7
+294,7
@@
EOT;
}
/**
}
/**
- * @param Status $status
+ * @param Status
&
$status
* @return Status
*/
public function setupSearchIndex( &$status ) {
* @return Status
*/
public function setupSearchIndex( &$status ) {