X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FDatabaseUpdater.php;h=b32be3953a7cad9f6fc42b4dbf5acf64339c4365;hp=7a92807e0ca4e64786286ba8a55747aad019af4b;hb=a469e81971a11b931716897d65e1fa3fdfe378e2;hpb=04179d3a5ce90f3f967d0e004fdf68bd45b04541

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 7a92807e0c..b32be3953a 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -20,8 +20,8 @@
  * @file
  * @ingroup Deployment
  */
-use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IMaintainableDatabase;
 use MediaWiki\MediaWikiServices;
 
 require_once __DIR__ . '/../../maintenance/Maintenance.php';
@@ -59,7 +59,7 @@ abstract class DatabaseUpdater {
 	/**
 	 * Handle to the database subclass
 	 *
-	 * @var Database
+	 * @var IMaintainableDatabase
 	 */
 	protected $db;
 
@@ -110,11 +110,15 @@ abstract class DatabaseUpdater {
 	protected $holdContentHandlerUseDB = true;
 
 	/**
-	 * @param Database &$db To perform updates on
+	 * @param IMaintainableDatabase &$db To perform updates on
 	 * @param bool $shared Whether to perform updates on shared tables
 	 * @param Maintenance|null $maintenance Maintenance object which created us
 	 */
-	protected function __construct( Database &$db, $shared, Maintenance $maintenance = null ) {
+	protected function __construct(
+		IMaintainableDatabase &$db,
+		$shared,
+		Maintenance $maintenance = null
+	) {
 		$this->db = $db;
 		$this->db->setFlag( DBO_DDLMODE ); // For Oracle's handling of schema files
 		$this->shared = $shared;
@@ -177,14 +181,18 @@ abstract class DatabaseUpdater {
 	}
 
 	/**
-	 * @param Database $db
+	 * @param IMaintainableDatabase $db
 	 * @param bool $shared
 	 * @param Maintenance|null $maintenance
 	 *
 	 * @throws MWException
 	 * @return DatabaseUpdater
 	 */
-	public static function newForDB( Database $db, $shared = false, Maintenance $maintenance = null ) {
+	public static function newForDB(
+		IMaintainableDatabase $db,
+		$shared = false,
+		Maintenance $maintenance = null
+	) {
 		$type = $db->getType();
 		if ( in_array( $type, Installer::getDBTypes() ) ) {
 			$class = ucfirst( $type ) . 'Updater';
@@ -198,7 +206,7 @@ abstract class DatabaseUpdater {
 	/**
 	 * Get a database connection to run updates
 	 *
-	 * @return Database
+	 * @return IMaintainableDatabase
 	 */
 	public function getDB() {
 		return $this->db;
@@ -410,9 +418,7 @@ abstract class DatabaseUpdater {
 		$this->updatesSkipped = [];
 
 		foreach ( $updates as $funcList ) {
-			$func = $funcList[0];
-			$args = $funcList[1];
-			$origParams = $funcList[2];
+			list( $func, $args, $origParams ) = $funcList;
 			$func( ...$args );
 			flush();
 			$this->updatesSkipped[] = $origParams;
@@ -1221,7 +1227,7 @@ abstract class DatabaseUpdater {
 	 */
 	protected function rebuildLocalisationCache() {
 		/**
-		 * @var $cl RebuildLocalisationCache
+		 * @var RebuildLocalisationCache $cl
 		 */
 		$cl = $this->maintenance->runChild(
 			RebuildLocalisationCache::class, 'rebuildLocalisationCache.php'