X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FSqliteInstaller.php;h=6f168720c7ca47f6516ad195067a59f952888b7b;hb=9a37fb8e4851d13bfb208eb886c9947a7f21571c;hp=0fe7068ba070d2356d0c236339b758728a98fd38;hpb=2c8f7978df47f338ee6e245e3efba6175ba425e9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 0fe7068ba0..6f168720c7 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -21,6 +21,10 @@
  * @ingroup Deployment
  */
 
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DatabaseSqlite;
+use Wikimedia\Rdbms\DBConnectionError;
+
 /**
  * Class for setting up the MediaWiki database using SQLLite.
  *
@@ -28,7 +32,9 @@
  * @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
@@ -53,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(), 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' );
@@ -157,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 ) {
-				MediaWiki\suppressWarnings();
+				Wikimedia\suppressWarnings();
 				$ok = wfMkdirParents( $dir, 0700, __METHOD__ );
-				MediaWiki\restoreWarnings();
+				Wikimedia\restoreWarnings();
 				if ( !$ok ) {
 					return Status::newFatal( 'config-sqlite-mkdir-error', $dir );
 				}
@@ -262,8 +265,8 @@ EOT;
 	}
 
 	/**
-	 * @param $dir
-	 * @param $db
+	 * @param string $dir
+	 * @param string $db
 	 * @return Status
 	 */
 	protected function makeStubDBFile( $dir, $db ) {
@@ -291,7 +294,7 @@ EOT;
 	}
 
 	/**
-	 * @param Status $status
+	 * @param Status &$status
 	 * @return Status
 	 */
 	public function setupSearchIndex( &$status ) {
@@ -318,7 +321,7 @@ EOT;
 		return "# SQLite-specific settings
 \$wgSQLiteDataDir = \"{$dir}\";
 \$wgObjectCaches[CACHE_DB] = [
-	'class' => 'SqlBagOStuff',
+	'class' => SqlBagOStuff::class,
 	'loggroup' => 'SQLBagOStuff',
 	'server' => [
 		'type' => 'sqlite',