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 "resourceloader: Re-enable testGetBlobCached() test case"
[lhc/web/wiklou.git]
/
includes
/
installer
/
SqliteInstaller.php
diff --git
a/includes/installer/SqliteInstaller.php
b/includes/installer/SqliteInstaller.php
index
d60d801
..
6f16872
100644
(file)
--- a/
includes/installer/SqliteInstaller.php
+++ b/
includes/installer/SqliteInstaller.php
@@
-33,7
+33,8
@@
use Wikimedia\Rdbms\DBConnectionError;
*/
class SqliteInstaller extends DatabaseInstaller {
*/
class SqliteInstaller extends DatabaseInstaller {
- public $minimumVersion = '3.3.7';
+ public static $minimumVersion = '3.3.7';
+ protected static $notMiniumumVerisonMessage = 'config-outdated-sqlite';
/**
* @var DatabaseSqlite
/**
* @var DatabaseSqlite
@@
-58,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(), $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' );
// Check for FTS3 full-text search module
if ( DatabaseSqlite::getFulltextSearchModule() != 'FTS3' ) {
$result->warning( 'config-no-fts3' );
@@
-162,9
+160,9
@@
class SqliteInstaller extends DatabaseInstaller {
# Called early on in the installer, later we just want to sanity check
# if it's still writable
if ( $create ) {
# Called early on in the installer, later we just want to sanity check
# if it's still writable
if ( $create ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$ok = wfMkdirParents( $dir, 0700, __METHOD__ );
$ok = wfMkdirParents( $dir, 0700, __METHOD__ );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( !$ok ) {
return Status::newFatal( 'config-sqlite-mkdir-error', $dir );
}
if ( !$ok ) {
return Status::newFatal( 'config-sqlite-mkdir-error', $dir );
}
@@
-323,7
+321,7
@@
EOT;
return "# SQLite-specific settings
\$wgSQLiteDataDir = \"{$dir}\";
\$wgObjectCaches[CACHE_DB] = [
return "# SQLite-specific settings
\$wgSQLiteDataDir = \"{$dir}\";
\$wgObjectCaches[CACHE_DB] = [
- 'class' =>
'SqlBagOStuff'
,
+ 'class' =>
SqlBagOStuff::class
,
'loggroup' => 'SQLBagOStuff',
'server' => [
'type' => 'sqlite',
'loggroup' => 'SQLBagOStuff',
'server' => [
'type' => 'sqlite',