DomainEvents: Rename getOldRevision and getNewRevision

Why:
- Use consistent naming scheme based on "before" and "after" to
  represent the change.

What:
- rename getOldRevision to getLatestRevisionBefore
- rename getNewRevision to getLatestRevisionAfter

Bug: T388588
Change-Id: I30078f606f457981987d95def5b2aaae181f0690

8 files changed, 26 insertions, 26 deletions

diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
index 8d51b84793b2..882a0a8212b9 100644
--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
@@ -482,11 +482,11 @@ class DerivedPageDataUpdaterTest extends MediaWikiIntegrationTestCase {
 		$this->expectDomainEvent(
 			PageRevisionUpdatedEvent::TYPE, 1,
 			static function ( PageRevisionUpdatedEvent $event ) use ( $rev1, $editResult ) {
-				Assert::assertSame( $rev1, $event->getNewRevision() );
-				Assert::assertSame( $rev1->getId(), $event->getOldRevision()->getId() );
+				Assert::assertSame( $rev1, $event->getLatestRevisionAfter() );
+				Assert::assertSame( $rev1->getId(), $event->getLatestRevisionBefore()->getId() );
 				Assert::assertSame( $editResult, $event->getEditResult() );
 				Assert::assertFalse( $event->isCreation() );
-				Assert::assertFalse( $event->changedCurrentRevisionId() );
+				Assert::assertFalse( $event->changedLatestRevisionId() );
 				Assert::assertTrue( $event->isReconciliationRequest() );
 			}
 		);
diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php
index 3f4d46da3dc3..abfa44a4c579 100644
--- a/tests/phpunit/includes/Storage/PageUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php
@@ -436,8 +436,8 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
 			);
 			Assert::assertSame(
 				$revisionChange,
-				$event->changedCurrentRevisionId(),
-				'changedCurrentRevisionId'
+				$event->changedLatestRevisionId(),
+				'changedLatestRevisionId'
 			);
 			Assert::assertSame( // null edits
 				!$revisionChange,
@@ -465,7 +465,7 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
 				'getPerformer'
 			);
 			Assert::assertSame(
-				$event->getNewRevision()->getUser(),
+				$event->getLatestRevisionAfter()->getUser(),
 				$event->getAuthor(),
 				'getAuthor'
 			);
@@ -477,10 +477,10 @@ class PageUpdaterTest extends MediaWikiIntegrationTestCase {
 
 			if ( $old ) {
 				Assert::assertSame(
-					$old->getId(), $event->getOldRevision()->getId(), 'getOldRevision'
+					$old->getId(), $event->getLatestRevisionBefore()->getId(), 'getOldRevision'
 				);
 			} else {
-				Assert::assertNull( $event->getOldRevision(), 'getOldRevision' );
+				Assert::assertNull( $event->getLatestRevisionBefore(), 'getOldRevision' );
 			}
 
 			foreach ( $flags as $name => $value ) {
diff --git a/tests/phpunit/includes/api/ApiImportTest.php b/tests/phpunit/includes/api/ApiImportTest.php
index a6b1182de4bd..a3a3203f26d6 100644
--- a/tests/phpunit/includes/api/ApiImportTest.php
+++ b/tests/phpunit/includes/api/ApiImportTest.php
@@ -58,25 +58,25 @@ class ApiImportTest extends ApiUploadTestCase {
 				if ( $calls === 1 ) {
 					// First call, from ImportableOldRevisionImporter
 					Assert::assertTrue( $event->isCreation(), 'isCreation' );
-					Assert::assertTrue( $event->changedCurrentRevisionId(), 'changedCurrentRevisionId' );
+					Assert::assertTrue( $event->changedLatestRevisionId(), 'changedLatestRevisionId' );
 					Assert::assertTrue( $event->isEffectiveContentChange(), 'isEffectiveContentChange' );
 					Assert::assertTrue( $event->isNominalContentChange(), 'isNominalContentChange' );
 					Assert::assertTrue( $event->isSilent(), 'isSilent' );
 
 					Assert::assertFalse(
-						$event->getNewRevision()->isMinor(),
+						$event->getLatestRevisionAfter()->isMinor(),
 						'isMinor'
 					);
 				} else {
 					// Second call, from ApiImportReporter
 					Assert::assertFalse( $event->isCreation(), 'isCreation' );
-					Assert::assertTrue( $event->changedCurrentRevisionId(), 'changedCurrentRevisionId' );
+					Assert::assertTrue( $event->changedLatestRevisionId(), 'changedLatestRevisionId' );
 					Assert::assertFalse( $event->isEffectiveContentChange(), 'isEffectiveContentChange' );
 					Assert::assertFalse( $event->isNominalContentChange(), 'isNominalContentChange' );
 					Assert::assertTrue( $event->isSilent(), 'isSilent' );
 
 					Assert::assertTrue(
-						$event->getNewRevision()->isMinor(),
+						$event->getLatestRevisionAfter()->isMinor(),
 						'isMinor'
 					);
 				}
diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
index a56bc01b3bda..5a9b0a9ae327 100644
--- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php
+++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
@@ -948,7 +948,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
 				Assert::assertSame( $file->getName(), $event->getPage()->getDBkey() );
 
 				Assert::assertTrue( $event->isCreation(), 'isCreation' );
-				Assert::assertTrue( $event->changedCurrentRevisionId(), 'changedCurrentRevisionId' );
+				Assert::assertTrue( $event->changedLatestRevisionId(), 'changedLatestRevisionId' );
 				Assert::assertTrue( $event->isEffectiveContentChange(), 'isEffectiveContentChange' );
 				Assert::assertTrue( $event->isNominalContentChange(), 'isNominalContentChange' );
 
@@ -1009,7 +1009,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
 				Assert::assertSame( $file->getName(), $event->getPage()->getDBkey() );
 
 				Assert::assertFalse( $event->isCreation(), 'isCreation' );
-				Assert::assertTrue( $event->changedCurrentRevisionId(), 'changedCurrentRevisionId' );
+				Assert::assertTrue( $event->changedLatestRevisionId(), 'changedLatestRevisionId' );
 				Assert::assertFalse( $event->isEffectiveContentChange(), 'isEffectiveContentChange' );
 				Assert::assertFalse( $event->isNominalContentChange(), 'isNominalContentChange' );
 
@@ -1022,7 +1022,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
 				Assert::assertTrue( $event->isImplicit(), 'isImplicit' );
 
 				Assert::assertFalse(
-					$event->getNewRevision()->isMinor(),
+					$event->getLatestRevisionAfter()->isMinor(),
 					'isMinor'
 				);
 			}
diff --git a/tests/phpunit/includes/page/MovePageTest.php b/tests/phpunit/includes/page/MovePageTest.php
index 2564b94ae360..d6f134b65f7d 100644
--- a/tests/phpunit/includes/page/MovePageTest.php
+++ b/tests/phpunit/includes/page/MovePageTest.php
@@ -639,8 +639,8 @@ class MovePageTest extends MediaWikiIntegrationTestCase {
 						'isReconciliationRequest'
 					);
 					Assert::assertTrue(
-						$event->changedCurrentRevisionId(),
-						'changedCurrentRevisionId'
+						$event->changedLatestRevisionId(),
+						'changedLatestRevisionId'
 					);
 					Assert::assertFalse(
 						$event->isEffectiveContentChange(),
@@ -651,11 +651,11 @@ class MovePageTest extends MediaWikiIntegrationTestCase {
 						'isNominalContentChange'
 					);
 					Assert::assertSame( $oldPageId, $event->getPage()->getId() );
-					Assert::assertSame( $oldRev->getId(), $event->getOldRevision()->getId() );
+					Assert::assertSame( $oldRev->getId(), $event->getLatestRevisionBefore()->getId() );
 					Assert::assertSame( $mover, $event->getPerformer() );
 
 					Assert::assertTrue(
-						$event->getNewRevision()->isMinor(),
+						$event->getLatestRevisionAfter()->isMinor(),
 						'isMinor'
 					);
 
@@ -675,8 +675,8 @@ class MovePageTest extends MediaWikiIntegrationTestCase {
 						'isReconciliationRequest'
 					);
 					Assert::assertTrue(
-						$event->changedCurrentRevisionId(),
-						'changedCurrentRevisionId'
+						$event->changedLatestRevisionId(),
+						'changedLatestRevisionId'
 					);
 					Assert::assertTrue(
 						$event->isEffectiveContentChange(),
diff --git a/tests/phpunit/includes/page/UndeletePageTest.php b/tests/phpunit/includes/page/UndeletePageTest.php
index 5d0ce852f575..2ac61e4108ec 100644
--- a/tests/phpunit/includes/page/UndeletePageTest.php
+++ b/tests/phpunit/includes/page/UndeletePageTest.php
@@ -179,8 +179,8 @@ class UndeletePageTest extends MediaWikiIntegrationTestCase {
 					'isNominalContentChange'
 				);
 				Assert::assertTrue(
-					$event->changedCurrentRevisionId(),
-					'changedCurrentRevisionId'
+					$event->changedLatestRevisionId(),
+					'changedLatestRevisionId'
 				);
 				Assert::assertFalse(
 					$event->isReconciliationRequest(),
diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php
index 489d692e4e97..81dea87ab8aa 100644
--- a/tests/phpunit/includes/page/WikiPageDbTest.php
+++ b/tests/phpunit/includes/page/WikiPageDbTest.php
@@ -1819,7 +1819,7 @@ more stuff
 			PageRevisionUpdatedEvent::TYPE, 1,
 			static function ( PageRevisionUpdatedEvent $event ) use ( &$calls, $page ) {
 				Assert::assertFalse( $event->isCreation(), 'isCreation' );
-				Assert::assertTrue( $event->changedCurrentRevisionId(), 'changedCurrentRevisionId' );
+				Assert::assertTrue( $event->changedLatestRevisionId(), 'changedLatestRevisionId' );
 				Assert::assertFalse( $event->isEffectiveContentChange(), 'isEffectiveContentChange' );
 				Assert::assertSame( $page->getId(), $event->getPage()->getId() );
 
@@ -1832,7 +1832,7 @@ more stuff
 				Assert::assertTrue( $event->isImplicit(), 'isAutomated' );
 
 				Assert::assertTrue(
-					$event->getNewRevision()->isMinor(),
+					$event->getLatestRevisionAfter()->isMinor(),
 					'isMinor'
 				);
 			}
diff --git a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php
index 2a2ab3783296..c6f22edc5888 100644
--- a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php
+++ b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php
@@ -227,7 +227,7 @@ class UndoIntegrationTest extends MediaWikiIntegrationTestCase {
 					$oldestRevertedRevIndex,
 					$newestRevertedRevIndex,
 					$originalRevIndex,
-					$event->getNewRevision(),
+					$event->getLatestRevisionAfter(),
 					$newContent
 				);
 			}