Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399900 )
Change subject: Change typehint from DatabaseBase to IDatabase
......................................................................
Change typehint from DatabaseBase to IDatabase
Change-Id: I3ba8302b1b31261b4a86c11f69163130040f64a2
---
M MergeUser.php
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/00/399900/1
diff --git a/MergeUser.php b/MergeUser.php
index b9cab64..ae89575 100644
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -1,5 +1,6 @@
<?php
use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IDatabase;
/**
* Contains the actual database backend logic for merging users
@@ -99,7 +100,7 @@
$dbw->endAtomic( __METHOD__ );
}
- private function mergeBlocks( DatabaseBase $dbw ) {
+ private function mergeBlocks( IDatabase $dbw ) {
$dbw->startAtomic( __METHOD__ );
// Pull blocks directly from master
@@ -206,7 +207,7 @@
// Fields to update with the format:
// [
// tableName, idField, textField,
- // 'batchKey' => unique field, 'options' => array(), 'db' =>
DatabaseBase
+ // 'batchKey' => unique field, 'options' => array(), 'db' =>
IDatabase
// ];
// textField, batchKey, db, and options are optional
$updateFields = [
@@ -302,7 +303,7 @@
* Deduplicate watchlist entries
* which old (merge-from) and new (merge-to) users are watching
*
- * @param DatabaseBase $dbw
+ * @param IDatabase $dbw
*/
private function deduplicateWatchlistEntries( $dbw ) {
$dbw->startAtomic( __METHOD__ );
@@ -482,7 +483,7 @@
* Format is: table => user_id column
*
* If you want it to use a different db object:
- * table => array( user_id colum, 'db' => DatabaseBase );
+ * table => array( user_id colum, 'db' => IDatabase );
*/
$tablesToDelete = [
'user_groups' => 'ug_user',
--
To view, visit https://gerrit.wikimedia.org/r/399900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ba8302b1b31261b4a86c11f69163130040f64a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
