From 25c3a843b09b4766f4c2f9efe5dba0345320adf8 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem.wiki@gmail.com>
Date: Wed, 30 Jan 2019 15:08:56 -0800
Subject: [PATCH] Remove Revision::fetchRevision()

Deprecated in 1.28, hard deprecated since 1.31. No callers, never had
callers outside of core.

Change-Id: I39721d12ad0d221931d23f2807f0a87cf05f0e3a
---
 RELEASE-NOTES-1.33                            |  1 +
 includes/Revision.php                         | 16 --------------
 tests/phpunit/includes/RevisionDbTestBase.php | 22 -------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 7f81f9f702..dde620f73d 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -179,6 +179,7 @@ because of Phabricator reports.
   mediawiki.api.messages, and mediawiki.api.rollback.
 * The 'jquery.byteLimit' module alias for 'jquery.lengthLimit',
   deprecated in 1.31, was removed.
+* Revision::fetchRevision(), deprecated in 1.28, was removed.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/Revision.php b/includes/Revision.php
index c99f88afb7..e48d4a5058 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -33,8 +33,6 @@ use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IDatabase;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
-use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**
  * @deprecated since 1.31, use RevisionRecord, RevisionStore, and BlobStore instead.
@@ -299,20 +297,6 @@ class Revision implements IDBAccessObject {
 		return $rec === null ? null : new Revision( $rec );
 	}
 
-	/**
-	 * Return a wrapper for a series of database rows to
-	 * fetch all of a given page's revisions in turn.
-	 * Each row can be fed to the constructor to get objects.
-	 *
-	 * @param LinkTarget $title
-	 * @return ResultWrapper
-	 * @deprecated Since 1.28, no callers in core nor in known extensions. No-op since 1.31.
-	 */
-	public static function fetchRevision( LinkTarget $title ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		return new FakeResultWrapper( [] );
-	}
-
 	/**
 	 * Return the value of a select() JOIN conds array for the user table.
 	 * This will get user table rows for logged-in users.
diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php
index a2f27965c1..6c7b0e7d24 100644
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -572,28 +572,6 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
 		);
 	}
 
-	/**
-	 * @covers Revision::fetchRevision
-	 */
-	public function testFetchRevision() {
-		// Hidden process cache assertion below
-		$this->testPage->getRevision()->getId();
-
-		$this->testPage->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ );
-		$id = $this->testPage->getRevision()->getId();
-
-		$this->hideDeprecated( 'Revision::fetchRevision' );
-		$res = Revision::fetchRevision( $this->testPage->getTitle() );
-
-		# note: order is unspecified
-		$rows = [];
-		while ( ( $row = $res->fetchObject() ) ) {
-			$rows[$row->rev_id] = $row;
-		}
-
-		$this->assertEmpty( $rows, 'expected empty set' );
-	}
-
 	/**
 	 * @covers Revision::getPage
 	 */
-- 
2.20.1