Use WikiPage::doUserEditContent() instead of ::doEditContent()

Results in passing a user where previously the fallback
to $wgUser was being used, mostly in tests.

Bug: T255507
Change-Id: Iabe24315b23c0ad1272353186425e71974528d23

32 files changed, 458 insertions, 259 deletions

diff --git a/tests/phpunit/includes/EditPageConstraintsTest.php b/tests/phpunit/includes/EditPageConstraintsTest.php
index 219e930a91d0..f7b30949604d 100644
--- a/tests/phpunit/includes/EditPageConstraintsTest.php
+++ b/tests/phpunit/includes/EditPageConstraintsTest.php
@@ -72,9 +72,14 @@ class EditPageConstraintsTest extends MediaWikiLangTestCase {
 		$this->assertNotNull( $title );
 
 		$page = $this->getServiceContainer()->getWikiPageFactory()->newFromTitle( $title );
+
+		if ( $user == null ) {
+			$user = $this->getTestUser()->getUser();
+		}
+
 		if ( $baseText !== null ) {
 			$content = ContentHandler::makeContent( $baseText, $title );
-			$page->doEditContent( $content, "base text for test" );
+			$page->doUserEditContent( $content, $user, "base text for test" );
 
 			// Set the latest timestamp back a while
 			$dbw = wfGetDB( DB_PRIMARY );
@@ -97,10 +102,6 @@ class EditPageConstraintsTest extends MediaWikiLangTestCase {
 			);
 		}
 
-		if ( $user == null ) {
-			$user = $this->getTestUser()->getUser();
-		}
-
 		if ( !isset( $edit['wpEditToken'] ) ) {
 			$edit['wpEditToken'] = $user->getEditToken();
 		}
@@ -648,6 +649,7 @@ class EditPageConstraintsTest extends MediaWikiLangTestCase {
 		$permissionManager = $this->createMock( PermissionManager::class );
 		// Needs edit rights to pass EditRightConstraint and reach UserBlockConstraint
 		$permissionManager->method( 'userHasRight' )->willReturn( true );
+		$permissionManager->method( 'userCan' )->willReturn( true );
 
 		// Not worried about the specifics of the method call, those are tested in
 		// the UserBlockConstraintTest
diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php
index e4735004fab0..2725b8c61eb5 100644
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -137,11 +137,15 @@ class EditPageTest extends MediaWikiLangTestCase {
 			}
 		}
 
+		if ( $user == null ) {
+			$user = $this->getTestUser()->getUser();
+		}
+
 		$page = WikiPage::factory( $title );
 
 		if ( $baseText !== null ) {
 			$content = ContentHandler::makeContent( $baseText, $title );
-			$page->doEditContent( $content, "base text for test" );
+			$page->doUserEditContent( $content, $user, "base text for test" );
 			$this->forceRevisionDate( $page, '20120101000000' );
 
 			// sanity check
@@ -153,10 +157,6 @@ class EditPageTest extends MediaWikiLangTestCase {
 			$this->assertEditedTextEquals( $baseText, $currentText );
 		}
 
-		if ( $user == null ) {
-			$user = $this->getTestUser()->getUser();
-		}
-
 		if ( !isset( $edit['wpEditToken'] ) ) {
 			$edit['wpEditToken'] = $user->getEditToken();
 		}
diff --git a/tests/phpunit/includes/MovePageTest.php b/tests/phpunit/includes/MovePageTest.php
index 46380dde9144..2a8ae51146ef 100644
--- a/tests/phpunit/includes/MovePageTest.php
+++ b/tests/phpunit/includes/MovePageTest.php
@@ -374,7 +374,11 @@ class MovePageTest extends MediaWikiIntegrationTestCase {
 		);
 
 		$oldTitle = Title::newFromText( 'Some old title' );
-		WikiPage::factory( $oldTitle )->doEditContent( new WikitextContent( 'foo' ), 'bar' );
+		WikiPage::factory( $oldTitle )->doUserEditContent(
+			new WikitextContent( 'foo' ),
+			$this->getTestSysop()->getUser(),
+			'bar'
+		);
 		$newTitle = Title::newFromText( 'A brand new title' );
 		$mp = $this->newMovePage( $oldTitle, $newTitle );
 		$user = User::newFromName( 'TitleMove tester' );
diff --git a/tests/phpunit/includes/Revision/McrRevisionStoreDbTest.php b/tests/phpunit/includes/Revision/McrRevisionStoreDbTest.php
index 35377309d83d..4265c7e41421 100644
--- a/tests/phpunit/includes/Revision/McrRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Revision/McrRevisionStoreDbTest.php
@@ -267,12 +267,10 @@ class McrRevisionStoreDbTest extends RevisionStoreDbTestBase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'b-ä';
 		/** @var RevisionRecord $revRecord1 */
-		$revRecord1 = $page->doEditContent(
+		$revRecord1 = $page->doUserEditContent(
 			new WikitextContent( $text . '1' ),
-			__METHOD__ . 'b',
-			0,
-			false,
-			$this->getTestUser()->getUser()
+			$this->getTestUser()->getUser(),
+			__METHOD__ . 'b'
 		)->value['revision-record'];
 
 		$invalidRow = $this->revisionRecordToRow( $revRecord1 );
diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
index d5ffa2d30d95..51dd93aa3443 100644
--- a/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
+++ b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
@@ -106,12 +106,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 
 			$user = static::getTestSysop()->getUser();
 
-			$page->doEditContent(
+			$page->doUserEditContent(
 				new WikitextContent( 'UTContent-' . __CLASS__ ),
+				$user,
 				'UTPageSummary-' . __CLASS__,
-				EDIT_NEW | EDIT_SUPPRESS_RC,
-				false,
-				$user
+				EDIT_NEW | EDIT_SUPPRESS_RC
 			);
 		}
 
@@ -613,7 +612,12 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = WikiPage::factory( $title );
 
 		if ( !$page->exists() ) {
-			$page->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__, EDIT_NEW );
+			$page->doUserEditContent(
+				new WikitextContent( __METHOD__ ),
+				$this->getTestSysop()->getUser(),
+				__METHOD__,
+				EDIT_NEW
+			);
 		}
 
 		$revDetails['page'] = $page->getId();
@@ -678,7 +682,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	 */
 	public function testGetRcIdIfUnpatrolled_returnsRecentChangesId() {
 		$page = $this->getTestPage();
-		$status = $page->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ );
+		$status = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestUser()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -700,12 +708,10 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		// This assumes that sysops are auto patrolled
 		$sysop = $this->getTestSysop()->getUser();
 		$page = $this->getTestPage();
-		$status = $page->doEditContent(
+		$status = $page->doUserEditContent(
 			new WikitextContent( __METHOD__ ),
-			__METHOD__,
-			0,
-			false,
-			$sysop
+			$sysop,
+			__METHOD__
 		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
@@ -723,7 +729,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRecentChange() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -740,7 +750,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRevisionById() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -758,7 +772,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRevisionById_crossWiki_withPage() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 		$revId = $revRecord->getId();
@@ -786,7 +804,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRevisionById_crossWiki() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 		$revId = $revRecord->getId();
@@ -818,7 +840,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRevisionById_undefinedContentModel() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -850,7 +876,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$title = $getTitle();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -939,7 +969,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
 		$comment = __METHOD__;
-		$status = $page->doEditContent( $content, $comment );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			$comment
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 		$dbDomain = 'some_foreign_wiki';
@@ -966,7 +1000,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetRevisionByPageId() {
 		$page = $this->getTestPage();
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -992,7 +1030,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$title = $getTitle();
 		MWTimestamp::setFakeTime( '20110401090001' );
 		$content = new WikitextContent( __METHOD__ );
-		$status = $page->doEditContent( $content, __METHOD__ );
+		$status = $page->doUserEditContent(
+			$content,
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		);
 		/** @var RevisionRecord $revRecord */
 		$revRecord = $status->value['revision-record'];
 
@@ -1085,8 +1127,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'o-ö';
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__ . 'a'
 		)->value['revision-record'];
 
@@ -1130,8 +1173,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'a-ä';
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__ . 'a'
 		)->value['revision-record'];
 
@@ -1162,8 +1206,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'a-ä';
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__ . 'a'
 		)->value['revision-record'];
 
@@ -1186,8 +1231,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'a-ä';
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__ . 'a'
 		)->value['revision-record'];
 
@@ -1209,12 +1255,10 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__ . 'b-ä';
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
-			__METHOD__ . 'b',
-			0,
-			false,
-			$this->getTestUser()->getUser()
+			$this->getTestUser()->getUser(),
+			__METHOD__ . 'b'
 		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -1231,8 +1275,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$page = WikiPage::factory( $pageIdentity );
 		/** @var RevisionRecord $orig */
-		$orig = $page->doEditContent( new WikitextContent( $text ), __METHOD__ )
-			->value['revision-record'];
+		$orig = $page->doUserEditContent(
+			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		)->value['revision-record'];
 		$page->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
 
 		$db = wfGetDB( DB_PRIMARY );
@@ -1352,8 +1399,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$text = __METHOD__ . '-bä';
 		$page = WikiPage::factory( $title );
 		/** @var RevisionRecord $orig */
-		$orig = $page->doEditContent( new WikitextContent( $text ), __METHOD__ )
-			->value['revision-record'];
+		$orig = $page->doUserEditContent(
+			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		)->value['revision-record'];
 		$page->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
 
 		$db = wfGetDB( DB_PRIMARY );
@@ -1383,8 +1433,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$text = __METHOD__ . '-bä';
 		$page = WikiPage::factory( $title );
 		/** @var RevisionRecord $orig */
-		$orig = $page->doEditContent( new WikitextContent( $text ), __METHOD__ )
-			->value['revision-record'];
+		$orig = $page->doUserEditContent(
+			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		)->value['revision-record'];
 		$page->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
 
 		$db = wfGetDB( DB_PRIMARY );
@@ -1605,14 +1658,15 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 
 		$page = WikiPage::factory( $title );
+		$user = $this->getTestSysop()->getUser();
 		/** @var RevisionRecord $orig */
-		$page->doEditContent( new WikitextContent( "First" ), __METHOD__ . '-first' );
-		$orig = $page->doEditContent( new WikitextContent( "Foo" ), __METHOD__ )
+		$page->doUserEditContent( new WikitextContent( "First" ), $user, __METHOD__ . '-first' );
+		$orig = $page->doUserEditContent( new WikitextContent( "Foo" ), $user, __METHOD__ )
 			->value['revision-record'];
-		$page->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
+		$page->doDeleteArticleReal( __METHOD__, $user );
 
 		// re-create page, so we can later load revisions for it
-		$page->doEditContent( new WikitextContent( 'Two' ), __METHOD__ );
+		$page->doUserEditContent( new WikitextContent( 'Two' ), $user, __METHOD__ );
 
 		$db = wfGetDB( DB_PRIMARY );
 		$arQuery = $store->getArchiveQueryInfo();
@@ -1673,12 +1727,16 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetParentLengths() {
 		$page = WikiPage::factory( Title::newFromText( __METHOD__ ) );
 		/** @var RevisionRecord $revRecordOne */
-		$revRecordOne = $page->doEditContent(
-			new WikitextContent( __METHOD__ ), __METHOD__
+		$revRecordOne = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 		/** @var RevisionRecord $revRecordTwo */
-		$revRecordTwo = $page->doEditContent(
-			new WikitextContent( __METHOD__ . '2' ), __METHOD__
+		$revRecordTwo = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ . '2' ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -1705,12 +1763,16 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetPreviousRevision() {
 		$page = WikiPage::factory( Title::newFromText( __METHOD__ ) );
 		/** @var RevisionRecord $revRecordOne */
-		$revRecordOne = $page->doEditContent(
-			new WikitextContent( __METHOD__ ), __METHOD__
+		$revRecordOne = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 		/** @var RevisionRecord $revRecordTwo */
-		$revRecordTwo = $page->doEditContent(
-			new WikitextContent( __METHOD__ . '2' ), __METHOD__
+		$revRecordTwo = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ . '2' ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -1733,12 +1795,16 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetNextRevision() {
 		$page = WikiPage::factory( Title::newFromText( __METHOD__ ) );
 		/** @var RevisionRecord $revRecordOne */
-		$revRecordOne = $page->doEditContent(
-			new WikitextContent( __METHOD__ ), __METHOD__
+		$revRecordOne = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 		/** @var RevisionRecord $revRecordTwo */
-		$revRecordTwo = $page->doEditContent(
-			new WikitextContent( __METHOD__ . '2' ), __METHOD__
+		$revRecordTwo = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ . '2' ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -1797,8 +1863,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetTimestampFromId_found() {
 		$page = $this->getTestPage();
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ )
-			->value['revision-record'];
+		$revRecord = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$result = $store->getTimestampFromId( $revRecord->getId() );
@@ -1812,8 +1881,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetTimestampFromId_notFound() {
 		$page = $this->getTestPage();
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ )
-			->value['revision-record'];
+		$revRecord = $page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestSysop()->getUser(),
+			__METHOD__
+		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$result = $store->getTimestampFromId( $revRecord->getId() + 1 );
@@ -1827,17 +1899,18 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testCountRevisionsByPageId() {
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$page = WikiPage::factory( Title::newFromText( __METHOD__ ) );
+		$user = $this->getTestSysop()->getUser();
 
 		$this->assertSame(
 			0,
 			$store->countRevisionsByPageId( wfGetDB( DB_PRIMARY ), $page->getId() )
 		);
-		$page->doEditContent( new WikitextContent( 'a' ), 'a' );
+		$page->doUserEditContent( new WikitextContent( 'a' ), $user, 'a' );
 		$this->assertSame(
 			1,
 			$store->countRevisionsByPageId( wfGetDB( DB_PRIMARY ), $page->getId() )
 		);
-		$page->doEditContent( new WikitextContent( 'b' ), 'b' );
+		$page->doUserEditContent( new WikitextContent( 'b' ), $user, 'b' );
 		$this->assertSame(
 			2,
 			$store->countRevisionsByPageId( wfGetDB( DB_PRIMARY ), $page->getId() )
@@ -1850,17 +1923,18 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testCountRevisionsByTitle() {
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$page = WikiPage::factory( Title::newFromText( __METHOD__ ) );
+		$user = $this->getTestSysop()->getUser();
 
 		$this->assertSame(
 			0,
 			$store->countRevisionsByTitle( wfGetDB( DB_PRIMARY ), $page->getTitle() )
 		);
-		$page->doEditContent( new WikitextContent( 'a' ), 'a' );
+		$page->doUserEditContent( new WikitextContent( 'a' ), $user, 'a' );
 		$this->assertSame(
 			1,
 			$store->countRevisionsByTitle( wfGetDB( DB_PRIMARY ), $page->getTitle() )
 		);
-		$page->doEditContent( new WikitextContent( 'b' ), 'b' );
+		$page->doUserEditContent( new WikitextContent( 'b' ), $user, 'b' );
 		$this->assertSame(
 			2,
 			$store->countRevisionsByTitle( wfGetDB( DB_PRIMARY ), $page->getTitle() )
@@ -1873,7 +1947,11 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testUserWasLastToEdit_false() {
 		$sysop = $this->getTestSysop()->getUser();
 		$page = $this->getTestPage();
-		$page->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ );
+		$page->doUserEditContent(
+			new WikitextContent( __METHOD__ ),
+			$this->getTestUser()->getUser(), // not the $sysop
+			__METHOD__
+		);
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$result = $store->userWasLastToEdit(
@@ -1892,12 +1970,10 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$startTime = wfTimestampNow();
 		$sysop = $this->getTestSysop()->getUser();
 		$page = $this->getTestPage();
-		$page->doEditContent(
+		$page->doUserEditContent(
 			new WikitextContent( __METHOD__ ),
-			__METHOD__,
-			0,
-			false,
-			$sysop
+			$sysop,
+			__METHOD__
 		);
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -1917,12 +1993,10 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 	public function testGetKnownCurrentRevision( $getPageIdentity ) {
 		$page = $this->getTestPage();
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( __METHOD__ . 'b' ),
-			__METHOD__ . 'b',
-			0,
-			false,
-			$this->getTestUser()->getUser()
+			$this->getTestUser()->getUser(),
+			__METHOD__ . 'b'
 		)->value['revision-record'];
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
 		$storeRecord = $store->getKnownCurrentRevision(
@@ -2071,12 +2145,10 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__;
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
-			__METHOD__,
-			0,
-			false,
-			$this->getMutableTestUser()->getUser()
+			$this->getMutableTestUser()->getUser(),
+			__METHOD__
 		)->value['revision-record'];
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
@@ -2123,8 +2195,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$page = $this->getTestPage();
 		$text = __METHOD__;
 		/** @var RevisionRecord $revRecord */
-		$revRecord = $page->doEditContent(
+		$revRecord = $page->doUserEditContent(
 			new WikitextContent( $text ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__
 		)->value['revision-record'];
 
@@ -2432,16 +2505,23 @@ abstract class RevisionStoreDbTestBase extends MediaWikiIntegrationTestCase {
 		$text2 = __METHOD__ . '-bö';
 		$page2 = $otherPageTitle ? WikiPage::factory( $title2 ) : $page1;
 
+		$sysop = $this->getTestSysop()->getUser();
 		/** @var RevisionRecord $revRecord1 */
 		/** @var RevisionRecord $revRecord2 */
-		$revRecord1 = $page1->doEditContent( new WikitextContent( $text1 ), __METHOD__ )
-			->value['revision-record'];
-		$revRecord2 = $page2->doEditContent( new WikitextContent( $text2 ), __METHOD__ )
-			->value['revision-record'];
-		$page1->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
+		$revRecord1 = $page1->doUserEditContent(
+			new WikitextContent( $text1 ),
+			$sysop,
+			__METHOD__
+		)->value['revision-record'];
+		$revRecord2 = $page2->doUserEditContent(
+			new WikitextContent( $text2 ),
+			$sysop,
+			__METHOD__
+		)->value['revision-record'];
+		$page1->doDeleteArticleReal( __METHOD__, $sysop );
 
 		if ( $page2 !== $page1 ) {
-			$page2->doDeleteArticleReal( __METHOD__, $this->getTestSysop()->getUser() );
+			$page2->doDeleteArticleReal( __METHOD__, $sysop );
 		}
 
 		$store = MediaWikiServices::getInstance()->getRevisionStore();
diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php
index 3ed85d7e8059..3b982f353b81 100644
--- a/tests/phpunit/includes/TemplateCategoriesTest.php
+++ b/tests/phpunit/includes/TemplateCategoriesTest.php
@@ -17,12 +17,10 @@ class TemplateCategoriesTest extends MediaWikiLangTestCase {
 
 		$title = Title::newFromText( "Categorized from template" );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			new WikitextContent( '{{Categorising template}}' ),
-			'Create a page with a template',
-			0,
-			false,
-			$user
+			$user,
+			'Create a page with a template'
 		);
 
 		$this->assertEquals(
@@ -33,12 +31,10 @@ class TemplateCategoriesTest extends MediaWikiLangTestCase {
 
 		// Create template
 		$template = WikiPage::factory( Title::newFromText( 'Template:Categorising template' ) );
-		$template->doEditContent(
+		$template->doUserEditContent(
 			new WikitextContent( '[[Category:Solved bugs]]' ),
-			'Add a category through a template',
-			0,
-			false,
-			$user
+			$user,
+			'Add a category through a template'
 		);
 
 		// Run the job queue
@@ -52,12 +48,10 @@ class TemplateCategoriesTest extends MediaWikiLangTestCase {
 		);
 
 		// Edit the template
-		$template->doEditContent(
+		$template->doUserEditContent(
 			new WikitextContent( '[[Category:Solved bugs 2]]' ),
-			'Change the category added by the template',
-			0,
-			false,
-			$user
+			$user,
+			'Change the category added by the template'
 		);
 
 		// Run the job queue
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 9f8153f7f616..9ef922412429 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -882,7 +882,11 @@ class TitleTest extends MediaWikiIntegrationTestCase {
 
 		$article = new Article( $title );
 		$page = $article->getPage();
-		$page->doEditContent( new WikitextContent( 'Some [[link]]' ), 'summary' );
+		$page->doUserEditContent(
+			new WikitextContent( 'Some [[link]]' ),
+			$this->getTestSysop()->getUser(),
+			'summary'
+		);
 
 		// Tell Title it doesn't know whether it exists
 		$title->mArticleID = -1;
@@ -912,7 +916,11 @@ class TitleTest extends MediaWikiIntegrationTestCase {
 
 		$article = new Article( $title );
 		$page = $article->getPage();
-		$page->doEditContent( new WikitextContent( 'Some [[link]]' ), 'summary' );
+		$page->doUserEditContent(
+			new WikitextContent( 'Some [[link]]' ),
+			$this->getTestSysop()->getUser(),
+			'summary'
+		);
 
 		$this->assertGreaterThan( 0, $title->getArticleID() );
 		$this->assertSame( $title->getArticleID(), $title->getId() );
@@ -1780,7 +1788,11 @@ class TitleTest extends MediaWikiIntegrationTestCase {
 		$reflection_property->setValue( $title, null );
 		$cascade = 1;
 		$anotherPage = $this->getExistingTestPage( 'UTest2' );
-		$anotherPage->doEditContent( new WikitextContent( '{{:UTest1}}' ), 'test' );
+		$anotherPage->doUserEditContent(
+			new WikitextContent( '{{:UTest1}}' ),
+			$this->getTestSysop()->getUser(),
+			'test'
+		);
 		$anotherPage->doUpdateRestrictions(
 			[ 'edit' => 'sysop' ],
 			[],
@@ -1831,7 +1843,11 @@ class TitleTest extends MediaWikiIntegrationTestCase {
 
 		$cascade = 1;
 		$anotherPage = $this->getExistingTestPage( 'UTest2' );
-		$anotherPage->doEditContent( new WikitextContent( '{{:UTest1}}' ), 'test' );
+		$anotherPage->doUserEditContent(
+			new WikitextContent( '{{:UTest1}}' ),
+			$this->getTestSysop()->getUser(),
+			'test'
+		);
 		$anotherPage->doUpdateRestrictions(
 			[ 'edit' => 'sysop' ],
 			[],
diff --git a/tests/phpunit/includes/api/ApiChangeContentModelTest.php b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
index 4b522b6c758c..4d9191306eae 100644
--- a/tests/phpunit/includes/api/ApiChangeContentModelTest.php
+++ b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
@@ -99,12 +99,11 @@ class ApiChangeContentModelTest extends ApiTestCase {
 	public function testInvalidContent() {
 		$wikipage = $this->getExistingTestPage( 'PageWithTextThatIsNotValidJSON' );
 		$invalidJSON = 'Foo\nBar\nEaster egg\nT22281';
-		$wikipage->doEditContent(
+		$wikipage->doUserEditContent(
 			ContentHandler::makeContent( $invalidJSON, $wikipage->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'EditSummaryForThisTest',
-			EDIT_UPDATE | EDIT_SUPPRESS_RC,
-			false,
-			$this->getTestSysop()->getUser()
+			EDIT_UPDATE | EDIT_SUPPRESS_RC
 		);
 		$this->assertSame(
 			'wikitext',
@@ -214,12 +213,11 @@ class ApiChangeContentModelTest extends ApiTestCase {
 		$title = Title::newFromText( 'Dummy:NoDirectEditing' );
 
 		$dummyContent = ContentHandler::getForModelID( 'testing' )->makeEmptyContent();
-		WikiPage::factory( $title )->doEditContent(
+		WikiPage::factory( $title )->doUserEditContent(
 			$dummyContent,
+			$this->getTestSysop()->getUser(),
 			'EditSummaryForThisTest',
-			EDIT_NEW | EDIT_SUPPRESS_RC,
-			false,
-			$this->getTestSysop()->getUser()
+			EDIT_NEW | EDIT_SUPPRESS_RC
 		);
 		$this->assertSame(
 			'testing',
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php
index b10394a1ff2b..0a65f2fe24ea 100644
--- a/tests/phpunit/includes/api/ApiComparePagesTest.php
+++ b/tests/phpunit/includes/api/ApiComparePagesTest.php
@@ -18,8 +18,8 @@ class ApiComparePagesTest extends ApiTestCase {
 
 		$page = WikiPage::factory( $title );
 		$user = static::getTestSysop()->getUser();
-		$status = $page->doEditContent(
-			$content, 'Test for ApiComparePagesTest: ' . $text, 0, false, $user
+		$status = $page->doUserEditContent(
+			$content, $user, 'Test for ApiComparePagesTest: ' . $text
 		);
 		if ( !$status->isOK() ) {
 			$this->fail( "Failed to create $title: " . $status->getWikiText( false, false, 'en' ) );
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 2c66b05591a9..b0786f2615e9 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -171,7 +171,11 @@ class ApiEditPageTest extends ApiTestCase {
 		$page = WikiPage::factory( Title::newFromText( $name ) );
 		$text = "==section 1==\ncontent 1\n==section 2==\ncontent2";
 		// Preload the page with some text
-		$page->doEditContent( ContentHandler::makeContent( $text, $page->getTitle() ), 'summary' );
+		$page->doUserEditContent(
+			ContentHandler::makeContent( $text, $page->getTitle() ),
+			$this->getTestSysop()->getUser(),
+			'summary'
+		);
 
 		list( $re ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
@@ -259,19 +263,34 @@ class ApiEditPageTest extends ApiTestCase {
 		$rpage = WikiPage::factory( $rtitle );
 
 		// base edit for content
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseTime = $page->getRevisionRecord()->getTimestamp();
 
 		// base edit for redirect
-		$rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$rpage->doUserEditContent(
+			new WikitextContent( "#REDIRECT [[$name]]" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $rpage, '20120101000000' );
 
 		// conflicting edit to redirect
-		$rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]\n\n[[Category:Test]]" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$rpage->doUserEditContent(
+			new WikitextContent( "#REDIRECT [[$name]]\n\n[[Category:Test]]" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $rpage, '20120101020202' );
 
 		// try to save edit, following the redirect
@@ -305,19 +324,34 @@ class ApiEditPageTest extends ApiTestCase {
 		$rpage = WikiPage::factory( $rtitle );
 
 		// base edit for content
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseTime = $page->getRevisionRecord()->getTimestamp();
 
 		// base edit for redirect
-		$rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$rpage->doUserEditContent(
+			new WikitextContent( "#REDIRECT [[$name]]" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $rpage, '20120101000000' );
 
 		// conflicting edit to redirect
-		$rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]\n\n[[Category:Test]]" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$rpage->doUserEditContent(
+			new WikitextContent( "#REDIRECT [[$name]]\n\n[[Category:Test]]" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $rpage, '20120101020202' );
 
 		// try to save edit, following the redirect but without creating a section
@@ -347,14 +381,24 @@ class ApiEditPageTest extends ApiTestCase {
 		$page = WikiPage::factory( $title );
 
 		// base edit
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseId = $page->getRevisionRecord()->getId();
 
 		// conflicting edit
-		$page->doEditContent( new WikitextContent( "Foo bar" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo bar" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $page, '20120101020202' );
 
 		// try to save edit, expect conflict
@@ -383,14 +427,24 @@ class ApiEditPageTest extends ApiTestCase {
 		$page = WikiPage::factory( $title );
 
 		// base edit
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseTime = $page->getRevisionRecord()->getTimestamp();
 
 		// conflicting edit
-		$page->doEditContent( new WikitextContent( "Foo bar" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo bar" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $page, '20120101020202' );
 
 		// try to save edit, expect conflict
@@ -422,14 +476,24 @@ class ApiEditPageTest extends ApiTestCase {
 		$page = WikiPage::factory( $title );
 
 		// base edit
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseTime = $page->getRevisionRecord()->getTimestamp();
 
 		// conflicting edit
-		$page->doEditContent( new WikitextContent( "Foo bar" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo bar" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $page, '20120101020202' );
 
 		// try to save edit, expect no conflict
@@ -465,18 +529,33 @@ class ApiEditPageTest extends ApiTestCase {
 		$rpage = WikiPage::factory( $rtitle );
 
 		// base edit for content
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 
 		// base edit for redirect
-		$rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$rpage->doUserEditContent(
+			new WikitextContent( "#REDIRECT [[$name]]" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $rpage, '20120101000000' );
 
 		// new edit to content
-		$page->doEditContent( new WikitextContent( "Foo bar" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo bar" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $rpage, '20120101020202' );
 
 		// try to save edit; should work, following the redirect.
@@ -1624,16 +1703,26 @@ class ApiEditPageTest extends ApiTestCase {
 		$page = WikiPage::factory( $title );
 
 		// base edit, currently in Wikitext
-		$page->doEditContent( new WikitextContent( "Foo" ),
-			"testing 1", EDIT_NEW, false, self::$users['sysop']->getUser() );
+		$page->doUserEditContent(
+			new WikitextContent( "Foo" ),
+			self::$users['sysop']->getUser(),
+			"testing 1",
+			EDIT_NEW,
+			false
+		);
 		$this->forceRevisionDate( $page, '20120101000000' );
 		$baseId = $page->getRevisionRecord()->getId();
 
 		// Attempt edit in Javascript. This may happen, for instance, if we
 		// started editing the base content while it was in Javascript and
 		// before we save it was changed to Wikitext (base edit model).
-		$page->doEditContent( new JavaScriptContent( "Bar" ),
-			"testing 2", EDIT_UPDATE, $page->getLatest(), self::$users['uploader']->getUser() );
+		$page->doUserEditContent(
+			new JavaScriptContent( "Bar" ),
+			self::$users['uploader']->getUser(),
+			"testing 2",
+			EDIT_UPDATE,
+			$page->getLatest()
+		);
 		$this->forceRevisionDate( $page, '20120101020202' );
 
 		// ContentHanlder may throw exception if we attempt saving the above, so we will
diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php
index f289f4be4765..400e2def551e 100644
--- a/tests/phpunit/includes/api/ApiStashEditTest.php
+++ b/tests/phpunit/includes/api/ApiStashEditTest.php
@@ -246,8 +246,9 @@ class ApiStashEditTest extends ApiTestCase {
 		$page = WikiPage::factory( Title::makeTitle( NS_MAIN, $name ) );
 
 		$content = new CssContent( 'Css' );
-		$revRecord = $page->doEditContent( $content, '' )->value['revision-record'];
-		$page->doEditContent( new WikitextContent( 'Text' ), '' );
+		$user = $this->getTestSysop()->getUser();
+		$revRecord = $page->doUserEditContent( $content, $user, '' )->value['revision-record'];
+		$page->doUserEditContent( new WikitextContent( 'Text' ), $user, '' );
 
 		$this->setExpectedApiException(
 			[ 'apierror-contentmodel-mismatch', 'wikitext', 'css' ]
diff --git a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
index 177791c49785..c7c7d7cb574d 100644
--- a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
@@ -12,15 +12,16 @@ class ApiFormatXmlTest extends ApiFormatTestBase {
 	public static function setUpBeforeClass() : void {
 		parent::setUpBeforeClass();
 		$page = WikiPage::factory( Title::newFromText( 'MediaWiki:ApiFormatXmlTest.xsl' ) );
+		$user = self::getTestSysop()->getUser();
 		// phpcs:disable Generic.Files.LineLength
-		$page->doEditContent( new WikitextContent(
+		$page->doUserEditContent( new WikitextContent(
 			'<?xml version="1.0"?><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" />'
-		), 'Summary' );
+		), $user, 'Summary' );
 		// phpcs:enable
 		$page = WikiPage::factory( Title::newFromText( 'MediaWiki:ApiFormatXmlTest' ) );
-		$page->doEditContent( new WikitextContent( 'Bogus' ), 'Summary' );
+		$page->doUserEditContent( new WikitextContent( 'Bogus' ), $user, 'Summary' );
 		$page = WikiPage::factory( Title::newFromText( 'ApiFormatXmlTest' ) );
-		$page->doEditContent( new WikitextContent( 'Bogus' ), 'Summary' );
+		$page->doUserEditContent( new WikitextContent( 'Bogus' ), $user, 'Summary' );
 	}
 
 	public static function provideGeneralEncoding() {
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
index a42aea0f6e77..825002ea0c9f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
@@ -17,8 +17,9 @@ class ApiQueryAllPagesTest extends ApiTestCase {
 		$title = Title::newFromText( 'Category:Template:xyz' );
 		$page = WikiPage::factory( $title );
 
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( 'Some text', $page->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'inserting content'
 		);
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
index deee9f51df4a..9819aa5aa7df 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
@@ -21,12 +21,14 @@ class ApiQueryAllRevisionsTest extends ApiTestCase {
 		$title = Title::newFromText( $pageName );
 		$page = WikiPage::factory( $title );
 
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( 'Some text', $page->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'inserting content'
 		);
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( 'Some other text', $page->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'adding revision'
 		);
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
index 85d258ac5c16..e2d7ee1fd3fa 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
@@ -26,48 +26,42 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
 
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( __CLASS__ . $i++, $title ),
-			$summary,
-			0,
-			false,
-			$user
+			$user,
+			$summary
 		);
 	}
 
 	private function doMinorPageEdit( User $user, LinkTarget $target, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( __CLASS__, $title ),
+			$user,
 			$summary,
-			EDIT_MINOR,
-			false,
-			$user
+			EDIT_MINOR
 		);
 	}
 
 	private function doBotPageEdit( User $user, LinkTarget $target, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( __CLASS__, $title ),
+			$user,
 			$summary,
-			EDIT_FORCE_BOT,
-			false,
-			$user
+			EDIT_FORCE_BOT
 		);
 	}
 
 	private function doAnonPageEdit( LinkTarget $target, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( __CLASS__, $title ),
-			$summary,
-			0,
-			false,
-			User::newFromId( 0 )
+			User::newFromId( 0 ),
+			$summary
 		);
 	}
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
index 1ed5e95e0906..beab45b8b823 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -16,8 +16,9 @@ class ApiQueryRevisionsTest extends ApiTestCase {
 		$title = Title::newFromText( $pageName );
 		$page = WikiPage::factory( $title );
 
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( 'Some text', $page->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'inserting content'
 		);
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
index 3026cb0dec83..75537466d6e4 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
@@ -22,8 +22,10 @@ class ApiQueryUserContribsTest extends ApiTestCase {
 		$page = WikiPage::factory( $title );
 		for ( $i = 0; $i < 3; $i++ ) {
 			foreach ( array_reverse( $users ) as $user ) {
-				$status = $page->doEditContent(
-					ContentHandler::makeContent( "Test revision $user #$i", $title ), 'Test edit', 0, false, $user
+				$status = $page->doUserEditContent(
+					ContentHandler::makeContent( "Test revision $user #$i", $title ),
+					$user,
+					'Test edit'
 				);
 				if ( !$status->isOK() ) {
 					$this->fail( "Failed to edit $title: " . $status->getWikiText( false, false, 'en' ) );
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
index 75837e9f2e3b..601f4429a0e7 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
@@ -33,48 +33,42 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
 	private function doPageEdit( User $user, LinkTarget $target, $content, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( $content, $title ),
-			$summary,
-			0,
-			false,
-			$user
+			$user,
+			$summary
 		);
 	}
 
 	private function doMinorPageEdit( User $user, LinkTarget $target, $content, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( $content, $title ),
+			$user,
 			$summary,
-			EDIT_MINOR,
-			false,
-			$user
+			EDIT_MINOR
 		);
 	}
 
 	private function doBotPageEdit( User $user, LinkTarget $target, $content, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( $content, $title ),
+			$user,
 			$summary,
-			EDIT_FORCE_BOT,
-			false,
-			$user
+			EDIT_FORCE_BOT
 		);
 	}
 
 	private function doAnonPageEdit( LinkTarget $target, $content, $summary ) {
 		$title = Title::newFromLinkTarget( $target );
 		$page = WikiPage::factory( $title );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			ContentHandler::makeContent( $content, $title ),
-			$summary,
-			0,
-			false,
-			User::newFromId( 0 )
+			User::newFromId( 0 ),
+			$summary
 		);
 	}
 
diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
index 710ac7017856..258e8f14b028 100644
--- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php
+++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
@@ -229,10 +229,18 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 	 */
 	private function getCategorizationChange( $timestamp, $thisId, $lastId ) {
 		$wikiPage = new WikiPage( Title::newFromText( 'Testpage' ) );
-		$wikiPage->doEditContent( new WikitextContent( 'Some random text' ), 'page created' );
+		$wikiPage->doUserEditContent(
+			new WikitextContent( 'Some random text' ),
+			$this->getTestSysop()->getUser(),
+			'page created'
+		);
 
 		$wikiPage = new WikiPage( Title::newFromText( 'Category:Foo' ) );
-		$wikiPage->doEditContent( new WikitextContent( 'Some random text' ), 'category page created' );
+		$wikiPage->doUserEditContent(
+			new WikitextContent( 'Some random text' ),
+			$this->getTestSysop()->getUser(),
+			'category page created'
+		);
 
 		$user = $this->getMutableTestUser()->getUser();
 		$recentChange = $this->testRecentChangesHelper->makeCategorizationRecentChange(
diff --git a/tests/phpunit/includes/content/ContentModelChangeTest.php b/tests/phpunit/includes/content/ContentModelChangeTest.php
index 55857e2caad9..d73a1dfe523c 100644
--- a/tests/phpunit/includes/content/ContentModelChangeTest.php
+++ b/tests/phpunit/includes/content/ContentModelChangeTest.php
@@ -79,12 +79,11 @@ class ContentModelChangeTest extends MediaWikiIntegrationTestCase {
 	public function testInvalidContent() {
 		$invalidJSON = 'Foo\nBar\nEaster egg\nT22281';
 		$wikipage = $this->getExistingTestPage( 'PageWithTextThatIsNotValidJSON' );
-		$wikipage->doEditContent(
+		$wikipage->doUserEditContent(
 			ContentHandler::makeContent( $invalidJSON, $wikipage->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'EditSummaryForThisTest',
-			EDIT_UPDATE | EDIT_SUPPRESS_RC,
-			false,
-			$this->getTestSysop()->getUser()
+			EDIT_UPDATE | EDIT_SUPPRESS_RC
 		);
 		$this->assertSame(
 			'wikitext',
@@ -164,12 +163,11 @@ class ContentModelChangeTest extends MediaWikiIntegrationTestCase {
 	 */
 	public function testContentModelCanBeUsedOn() {
 		$wikipage = $this->getExistingTestPage( 'ExistingPage' );
-		$wikipage->doEditContent(
+		$wikipage->doUserEditContent(
 			ContentHandler::makeContent( 'Text', $wikipage->getTitle() ),
+			$this->getTestSysop()->getUser(),
 			'Ensure a revision exists',
-			EDIT_UPDATE | EDIT_SUPPRESS_RC,
-			false,
-			$this->getTestSysop()->getUser()
+			EDIT_UPDATE | EDIT_SUPPRESS_RC
 		);
 		$this->assertSame(
 			'wikitext',
@@ -214,12 +212,11 @@ class ContentModelChangeTest extends MediaWikiIntegrationTestCase {
 		$wikipage = WikiPage::factory( $title );
 
 		$dummyContent = ContentHandler::getForModelID( 'testing' )->makeEmptyContent();
-		$wikipage->doEditContent(
+		$wikipage->doUserEditContent(
 			$dummyContent,
+			$this->getTestSysop()->getUser(),
 			'EditSummaryForThisTest',
-			EDIT_NEW | EDIT_SUPPRESS_RC,
-			false,
-			$this->getTestSysop()->getUser()
+			EDIT_NEW | EDIT_SUPPRESS_RC
 		);
 		$this->assertSame(
 			'testing',
diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php
index 794f3e876efc..212e8aa1c159 100644
--- a/tests/phpunit/includes/content/TextContentTest.php
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -383,7 +383,7 @@ class TextContentTest extends MediaWikiLangTestCase {
 		$title = $page->getTitle();
 
 		$content = ContentHandler::makeContent( $text, $title, $model );
-		$page->doEditContent( $content, '' );
+		$page->doUserEditContent( $content, $this->getTestSysop()->getUser(), '' );
 
 		$updates = $content->getDeletionUpdates( $page );
 
diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php
index c0b6d4774e90..8f374a01d910 100644
--- a/tests/phpunit/includes/content/WikitextContentTest.php
+++ b/tests/phpunit/includes/content/WikitextContentTest.php
@@ -75,7 +75,7 @@ more stuff
 		$content = ContentHandler::makeContent( $text, $title, $model );
 
 		$page = WikiPage::factory( $title );
-		$page->doEditContent( $content, '' );
+		$page->doUserEditContent( $content, $this->getTestSysop()->getUser(), '' );
 
 		$updates = $content->getSecondaryDataUpdates( $title );
 
diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php
index 00e6cba865d7..b0c5760c7713 100644
--- a/tests/phpunit/includes/deferred/LinksUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -200,7 +200,11 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
 		$title = Title::newFromText( 'Testing' );
 		$wikiPage = new WikiPage( $title );
-		$wikiPage->doEditContent( new WikitextContent( '[[Category:Foo]]' ), 'added category' );
+		$wikiPage->doUserEditContent(
+			new WikitextContent( '[[Category:Foo]]' ),
+			$this->getTestSysop()->getUser(),
+			'added category'
+		);
 		$this->runAllRelatedJobs();
 
 		$this->assertRecentChangeByCategorization(
@@ -210,7 +214,11 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 			[ [ 'Foo', '[[:Testing]] added to category' ] ]
 		);
 
-		$wikiPage->doEditContent( new WikitextContent( '[[Category:Bar]]' ), 'replaced category' );
+		$wikiPage->doUserEditContent(
+			new WikitextContent( '[[Category:Bar]]' ),
+			$this->getTestSysop()->getUser(),
+			'replaced category'
+		);
 		$this->runAllRelatedJobs();
 
 		$this->assertRecentChangeByCategorization(
@@ -240,11 +248,19 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 		$templatePage = new WikiPage( $templateTitle );
 
 		$wikiPage = new WikiPage( Title::newFromText( 'Testing' ) );
-		$wikiPage->doEditContent( new WikitextContent( '{{TestingTemplate}}' ), 'added template' );
+		$wikiPage->doUserEditContent(
+			new WikitextContent( '{{TestingTemplate}}' ),
+			$this->getTestSysop()->getUser(),
+			'added template'
+		);
 		$this->runAllRelatedJobs();
 
 		$otherWikiPage = new WikiPage( Title::newFromText( 'Some_other_page' ) );
-		$otherWikiPage->doEditContent( new WikitextContent( '{{TestingTemplate}}' ), 'added template' );
+		$otherWikiPage->doUserEditContent(
+			new WikitextContent( '{{TestingTemplate}}' ),
+			$this->getTestSysop()->getUser(),
+			'added template'
+		);
 		$this->runAllRelatedJobs();
 
 		$this->assertRecentChangeByCategorization(
@@ -254,7 +270,11 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 			[]
 		);
 
-		$templatePage->doEditContent( new WikitextContent( '[[Category:Baz]]' ), 'added category' );
+		$templatePage->doUserEditContent(
+			new WikitextContent( '[[Category:Baz]]' ),
+			$this->getTestSysop()->getUser(),
+			'added category'
+		);
 		$this->runAllRelatedJobs();
 
 		$this->assertRecentChangeByCategorization(
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index ce921f0ab09e..dd59e18f96bc 100644
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -66,9 +66,10 @@ class DifferenceEngineTest extends MediaWikiIntegrationTestCase {
 		$strings = [ "it is a kitten", "two kittens", "three kittens", "four kittens" ];
 		$revisions = [];
 
+		$user = $this->getTestSysop()->getUser();
 		foreach ( $strings as $string ) {
 			$content = ContentHandler::makeContent( $string, $title );
-			$page->doEditContent( $content, 'edit page' );
+			$page->doUserEditContent( $content, $user, 'edit page' );
 			$revisions[] = $page->getLatest();
 		}
 
diff --git a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
index ef370c06c398..754402bcc28c 100644
--- a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
+++ b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
@@ -22,10 +22,11 @@ class RefreshLinksPartitionTest extends MediaWikiIntegrationTestCase {
 	public function testRefreshLinks( $ns, $dbKey, $pages ) {
 		$title = Title::makeTitle( $ns, $dbKey );
 
+		$user = $this->getTestSysop()->getUser();
 		foreach ( $pages as [ $bns, $bdbkey ] ) {
 			$bpage = WikiPage::factory( Title::makeTitle( $bns, $bdbkey ) );
 			$content = ContentHandler::makeContent( "[[{$title->getPrefixedText()}]]", $bpage->getTitle() );
-			$bpage->doEditContent( $content, "test" );
+			$bpage->doUserEditContent( $content, $user, "test" );
 		}
 
 		$title->getBacklinkCache()->clear();
diff --git a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
index 3931de42ecb2..834e5cec9920 100644
--- a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
@@ -39,8 +39,9 @@ class CategoryMembershipChangeJobTest extends MediaWikiIntegrationTestCase {
 	 */
 	private function editPageText( $text ) {
 		$page = WikiPage::factory( $this->title );
-		$editResult = $page->doEditContent(
+		$editResult = $page->doUserEditContent(
 			ContentHandler::makeContent( $text, $this->title ),
+			$this->getTestSysop()->getUser(),
 			__METHOD__
 		);
 		/** @var RevisionRecord $revisionRecord */
diff --git a/tests/phpunit/includes/page/ArticleTablesTest.php b/tests/phpunit/includes/page/ArticleTablesTest.php
index 5c5ce5c2921a..dfec2558331b 100644
--- a/tests/phpunit/includes/page/ArticleTablesTest.php
+++ b/tests/phpunit/includes/page/ArticleTablesTest.php
@@ -21,12 +21,10 @@ class ArticleTablesTest extends MediaWikiLangTestCase {
 		$this->setContentLang( 'es' );
 		$this->setUserLang( 'fr' );
 
-		$page->doEditContent(
+		$page->doUserEditContent(
 			new WikitextContent( '{{:{{int:history}}}}' ),
-			'Test code for T16404',
-			0,
-			false,
-			$user
+			$user,
+			'Test code for T16404'
 		);
 		$templates1 = $title->getTemplateLinksFrom();
 
@@ -34,12 +32,11 @@ class ArticleTablesTest extends MediaWikiLangTestCase {
 		$page = WikiPage::factory( $title ); // In order to force the re-rendering of the same wikitext
 
 		// We need an edit, a purge is not enough to regenerate the tables
-		$page->doEditContent(
+		$page->doUserEditContent(
 			new WikitextContent( '{{:{{int:history}}}}' ),
+			$user,
 			'Test code for T16404',
-			EDIT_UPDATE,
-			false,
-			$user
+			EDIT_UPDATE
 		);
 		$templates2 = $title->getTemplateLinksFrom();
 
diff --git a/tests/phpunit/includes/page/PageArchiveTest.php b/tests/phpunit/includes/page/PageArchiveTest.php
index 90f0768089b5..4dec8983a930 100644
--- a/tests/phpunit/includes/page/PageArchiveTest.php
+++ b/tests/phpunit/includes/page/PageArchiveTest.php
@@ -76,7 +76,7 @@ class PageArchiveTest extends MediaWikiIntegrationTestCase {
 		);
 
 		$user = $this->getTestUser()->getUser();
-		$page->doEditContent( $content, 'testing', EDIT_NEW, false, $user );
+		$page->doUserEditContent( $content, $user, 'testing', EDIT_NEW );
 
 		$this->pageId = $page->getId();
 		$this->firstRev = $page->getRevisionRecord();
diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php
index 636474f18410..d4234f47a00f 100644
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -401,8 +401,9 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 
 	private function editSearchResultPage( $title ) {
 		$page = WikiPage::factory( Title::newFromText( $title ) );
-		$page->doEditContent(
+		$page->doUserEditContent(
 			new WikitextContent( 'UTContent' ),
+			$this->getTestSysop()->getUser(),
 			'UTPageSummary',
 			EDIT_NEW | EDIT_SUPPRESS_RC
 		);
diff --git a/tests/phpunit/includes/specials/SpecialBlockTest.php b/tests/phpunit/includes/specials/SpecialBlockTest.php
index 6f88794356be..97dfb552be03 100644
--- a/tests/phpunit/includes/specials/SpecialBlockTest.php
+++ b/tests/phpunit/includes/specials/SpecialBlockTest.php
@@ -775,12 +775,10 @@ class SpecialBlockTest extends SpecialPageTestBase {
 
 		$userToBlock = $this->getTestUser()->getUser();
 		$pageSaturn = $this->getExistingTestPage( 'Saturn' );
-		$pageSaturn->doEditContent(
+		$pageSaturn->doUserEditContent(
 			ContentHandler::makeContent( 'content', $pageSaturn->getTitle() ),
-			'summary',
-			0,
-			false,
-			$userToBlock
+			$userToBlock,
+			'summary'
 		);
 
 		$context = new DerivativeContext( RequestContext::getMain() );
diff --git a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php
index 62bbdd522148..da39cd88c373 100644
--- a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php
+++ b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php
@@ -18,12 +18,12 @@ class SpecialMyLanguageTest extends MediaWikiIntegrationTestCase {
 		foreach ( $titles as $title ) {
 			$page = WikiPage::factory( Title::newFromText( $title ) );
 			if ( $page->getId() == 0 ) {
-				$page->doEditContent(
+				$page->doUserEditContent(
 					new WikitextContent( 'UTContent' ),
+					User::newFromName( 'UTSysop' ),
 					'UTPageSummary',
-					EDIT_NEW,
-					false,
-					User::newFromName( 'UTSysop' ) );
+					EDIT_NEW
+				);
 			}
 		}
 	}
diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index 7d727fa7123c..7748ed732a2d 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -365,12 +365,10 @@ class UserTest extends MediaWikiIntegrationTestCase {
 		// let the user have a few (3) edits
 		$page = WikiPage::factory( Title::makeTitle( NS_HELP, 'UserTest_EditCount' ) );
 		for ( $i = 0; $i < 3; $i++ ) {
-			$page->doEditContent(
+			$page->doUserEditContent(
 				ContentHandler::makeContent( (string)$i, $page->getTitle() ),
-				'test',
-				0,
-				false,
-				$user
+				$user,
+				'test'
 			);
 		}