From 25d821830c404754e46bc87208c08263088dc929 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 3 Nov 2015 18:13:45 -0800
Subject: [PATCH] Remove WikiPage::doQuickEdit

Change-Id: If56f790b8a29b2262cba0feff7a96312c69cdb0c
---
 RELEASE-NOTES-1.27                           |  1 +
 includes/page/WikiPage.php                   | 19 -------------------
 tests/phpunit/includes/page/WikiPageTest.php | 19 -------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index f5496201cf..ca8124235f 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -96,6 +96,7 @@ changes to languages because of Bugzilla reports.
 * Removed "loaderScripts" option from ResourceLoaderFileModule class.
 * Removed ORM-like wrapper added in 1.20.
 * LinkCache::getGoodLinks and LinkCache::getBadLinks were removed (deprecated in 1.26).
+* WikiPage::doQuickEdit() was removed (deprecated since 1.21).
 
 == Compatibility ==
 
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 2d5cb786d7..ff8050b24c 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -2279,25 +2279,6 @@ class WikiPage implements Page, IDBAccessObject {
 		}
 	}
 
-	/**
-	 * Edit an article without doing all that other stuff
-	 * The article must already exist; link tables etc
-	 * are not updated, caches are not flushed.
-	 *
-	 * @param string $text Text submitted
-	 * @param User $user The relevant user
-	 * @param string $comment Comment submitted
-	 * @param bool $minor Whereas it's a minor modification
-	 *
-	 * @deprecated since 1.21, use doEditContent() instead.
-	 */
-	public function doQuickEdit( $text, User $user, $comment = '', $minor = 0 ) {
-		ContentHandler::deprecated( __METHOD__, "1.21" );
-
-		$content = ContentHandler::makeContent( $text, $this->getTitle() );
-		$this->doQuickEditContent( $content, $user, $comment, $minor );
-	}
-
 	/**
 	 * Edit an article without doing all that other stuff
 	 * The article must already exist; link tables etc
diff --git a/tests/phpunit/includes/page/WikiPageTest.php b/tests/phpunit/includes/page/WikiPageTest.php
index a21fc8a7f3..0a46f8a18c 100644
--- a/tests/phpunit/includes/page/WikiPageTest.php
+++ b/tests/phpunit/includes/page/WikiPageTest.php
@@ -212,25 +212,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 2, $n, 'pagelinks should contain two links from the page' );
 	}
 
-	/**
-	 * @covers WikiPage::doQuickEdit
-	 */
-	public function testDoQuickEdit() {
-		global $wgUser;
-
-		$this->hideDeprecated( "WikiPage::doQuickEdit" );
-
-		// NOTE: assume help namespace will default to wikitext
-		$page = $this->createPage( "Help:WikiPageTest_testDoQuickEdit", "original text" );
-
-		$text = "quick text";
-		$page->doQuickEdit( $text, $wgUser, "testing q" );
-
-		# ---------------------
-		$page = new WikiPage( $page->getTitle() );
-		$this->assertEquals( $text, $page->getText() );
-	}
-
 	/**
 	 * @covers WikiPage::doQuickEditContent
 	 */
-- 
2.20.1