X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FForeignDBRepo.php;h=bce3005c673bd74a80d1ef78d9728645ae9304c4;hb=1c0d9ba2e8e35c361ca94cdc75e4015542dda3a6;hp=283576a29eedcd31fc9c61d8bd66d801f8fe3a61;hpb=0e1c391d97418e646a58d6f6f2545a83271b07ff;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/ForeignDBRepo.php b/includes/filerepo/ForeignDBRepo.php
index 283576a29e..bce3005c67 100644
--- a/includes/filerepo/ForeignDBRepo.php
+++ b/includes/filerepo/ForeignDBRepo.php
@@ -21,6 +21,9 @@
  * @ingroup FileRepo
  */
 
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * A foreign repository with an accessible MediaWiki database
  *
@@ -51,10 +54,13 @@ class ForeignDBRepo extends LocalRepo {
 	/** @var bool */
 	protected $hasSharedCache;
 
-	# Other stuff
+	/** @var IDatabase */
 	protected $dbConn;
-	protected $fileFactory = array( 'ForeignDBFile', 'newFromTitle' );
-	protected $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' );
+
+	/** @var callable */
+	protected $fileFactory = [ 'ForeignDBFile', 'newFromTitle' ];
+	/** @var callable */
+	protected $fileFromRowFactory = [ 'ForeignDBFile', 'newFromRow' ];
 
 	/**
 	 * @param array|null $info
@@ -86,7 +92,7 @@ class ForeignDBRepo extends LocalRepo {
 	/**
 	 * @return IDatabase
 	 */
-	function getSlaveDB() {
+	function getReplicaDB() {
 		return $this->getMasterDB();
 	}
 
@@ -95,7 +101,7 @@ class ForeignDBRepo extends LocalRepo {
 	 */
 	protected function getDBFactory() {
 		$type = $this->dbType;
-		$params = array(
+		$params = [
 			'host' => $this->dbServer,
 			'user' => $this->dbUser,
 			'password' => $this->dbPassword,
@@ -103,10 +109,10 @@ class ForeignDBRepo extends LocalRepo {
 			'flags' => $this->dbFlags,
 			'tablePrefix' => $this->tablePrefix,
 			'foreign' => true,
-		);
+		];
 
 		return function ( $index ) use ( $type, $params ) {
-			return DatabaseBase::factory( $type, $params );
+			return Database::factory( $type, $params );
 		};
 	}
 
@@ -135,7 +141,7 @@ class ForeignDBRepo extends LocalRepo {
 	}
 
 	protected function assertWritableRepo() {
-		throw new MWException( get_class( $this ) . ': write operations are not supported.' );
+		throw new MWException( static::class . ': write operations are not supported.' );
 	}
 
 	/**