From acf2f9a6c339240f3e0dbc2f7b6219656b0c2229 Mon Sep 17 00:00:00 2001
From: Thiemo Kreuz <thiemo.kreuz@wikimedia.de>
Date: Tue, 30 Apr 2019 17:08:48 +0200
Subject: [PATCH] Add missing IDatabase type hints to all doAtomicSection()
 calls

Change-Id: I11061c358013fc67ec7a8ded54aeddcb7ff4910b
---
 includes/user/User.php               | 6 +++---
 maintenance/populateArchiveRevId.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/user/User.php b/includes/user/User.php
index ba6bb08a73..6608d99db2 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4197,7 +4197,7 @@ class User implements IDBAccessObject, UserIdentity {
 		$newTouched = $this->newTouchedTimestamp();
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) use ( $newTouched ) {
+		$dbw->doAtomicSection( __METHOD__, function ( IDatabase $dbw, $fname ) use ( $newTouched ) {
 			global $wgActorTableSchemaMigrationStage;
 
 			$dbw->update( 'user',
@@ -4323,7 +4323,7 @@ class User implements IDBAccessObject, UserIdentity {
 			$fields["user_$name"] = $value;
 		}
 
-		return $dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) use ( $fields ) {
+		return $dbw->doAtomicSection( __METHOD__, function ( IDatabase $dbw, $fname ) use ( $fields ) {
 			$dbw->insert( 'user', $fields, $fname, [ 'IGNORE' ] );
 			if ( $dbw->affectedRows() ) {
 				$newUser = self::newFromId( $dbw->insertId() );
@@ -4377,7 +4377,7 @@ class User implements IDBAccessObject, UserIdentity {
 		$this->mTouched = $this->newTouchedTimestamp();
 
 		$dbw = wfGetDB( DB_MASTER );
-		$status = $dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) {
+		$status = $dbw->doAtomicSection( __METHOD__, function ( IDatabase $dbw, $fname ) {
 			$noPass = PasswordFactory::newInvalidPassword()->toString();
 			$dbw->insert( 'user',
 				[
diff --git a/maintenance/populateArchiveRevId.php b/maintenance/populateArchiveRevId.php
index ec2eff4f91..96fcebf409 100644
--- a/maintenance/populateArchiveRevId.php
+++ b/maintenance/populateArchiveRevId.php
@@ -110,7 +110,7 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 		$ok = false;
 		while ( !$ok ) {
 			try {
-				$dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) {
+				$dbw->doAtomicSection( __METHOD__, function ( IDatabase $dbw, $fname ) {
 					$dbw->insert( 'revision', self::$dummyRev, $fname );
 					$id = $dbw->insertId();
 					$toDelete[] = $id;
@@ -147,7 +147,7 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 			self::$dummyRev = self::makeDummyRevisionRow( $dbw );
 		}
 
-		$updates = $dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) use ( $arIds ) {
+		$updates = $dbw->doAtomicSection( __METHOD__, function ( IDatabase $dbw, $fname ) use ( $arIds ) {
 			// Create new rev_ids by inserting dummy rows into revision and then deleting them.
 			$dbw->insert( 'revision', array_fill( 0, count( $arIds ), self::$dummyRev ), $fname );
 			$revIds = $dbw->selectFieldValues(
-- 
2.20.1