From: Reedy <reedy@wikimedia.org>
Date: Mon, 12 Dec 2016 18:51:37 +0000 (+0000)
Subject: WikiPage::getText() was removed
X-Git-Tag: 1.31.0-rc.0~4617^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=27f9e4af03792461027f7a4aa14f6f9b1cce972f

WikiPage::getText() was removed

Bug: T145728
Change-Id: I9e5ac149ad1780719b5c8f4e27048168cf33c0b9
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 4291302bd9..c493d755f9 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -116,6 +116,7 @@ changes to languages because of Phabricator reports.
   were removed.
 * Class RevisiondeleteAction (deprecated in 1.25) was removed.
 * WikiPage::prepareTextForEdit() (deprecated in 1.21) was removed.
+* WikiPage::getText() (deprecated in 1.21) was removed.
 
 == Compatibility ==
 
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 51d9c6afb7..0bb47baa1b 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -685,28 +685,6 @@ class WikiPage implements Page, IDBAccessObject {
 		return null;
 	}
 
-	/**
-	 * Get the text of the current revision. No side-effects...
-	 *
-	 * @param int $audience One of:
-	 *   Revision::FOR_PUBLIC       to be displayed to all users
-	 *   Revision::FOR_THIS_USER    to be displayed to the given user
-	 *   Revision::RAW              get the text regardless of permissions
-	 * @param User $user User object to check for, only if FOR_THIS_USER is passed
-	 *   to the $audience parameter
-	 * @return string|bool The text of the current revision
-	 * @deprecated since 1.21, getContent() should be used instead.
-	 */
-	public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) {
-		wfDeprecated( __METHOD__, '1.21' );
-
-		$this->loadLastEdit();
-		if ( $this->mLastRevision ) {
-			return $this->mLastRevision->getText( $audience, $user );
-		}
-		return false;
-	}
-
 	/**
 	 * @return string MW timestamp of last article revision
 	 */
diff --git a/tests/phpunit/includes/page/WikiPageTest.php b/tests/phpunit/includes/page/WikiPageTest.php
index a1aa47cea0..6885ca36c8 100644
--- a/tests/phpunit/includes/page/WikiPageTest.php
+++ b/tests/phpunit/includes/page/WikiPageTest.php
@@ -161,7 +161,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 	 */
 	public function testDoEdit() {
 		$this->hideDeprecated( "WikiPage::doEdit" );
-		$this->hideDeprecated( "WikiPage::getText" );
 		$this->hideDeprecated( "Revision::getText" );
 
 		// NOTE: assume help namespace will default to wikitext
@@ -189,12 +188,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals( 1, $n, 'pagelinks should contain one link from the page' );
 
-		# ------------------------
-		$page = new WikiPage( $title );
-
-		$retrieved = $page->getText();
-		$this->assertEquals( $text, $retrieved, 'retrieved text doesn\'t equal original' );
-
 		# ------------------------
 		$text = "At vero eos et accusam et justo duo [[dolores]] et ea rebum. "
 			. "Stet clita kasd [[gubergren]], no sea takimata sanctus est.";
@@ -204,7 +197,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
 		# ------------------------
 		$page = new WikiPage( $title );
 
-		$retrieved = $page->getText();
+		$retrieved = $page->getContent()->getNativeData();
 		$this->assertEquals( $text, $retrieved, 'retrieved text doesn\'t equal original' );
 
 		# ------------------------
@@ -242,10 +235,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 			$page->getContent(),
 			"WikiPage::getContent should return null after page was deleted"
 		);
-		$this->assertFalse(
-			$page->getText(),
-			"WikiPage::getText should return false after page was deleted"
-		);
 
 		$t = Title::newFromText( $page->getTitle()->getPrefixedText() );
 		$this->assertFalse(
@@ -332,24 +321,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 		$this->assertEquals( "some text", $content->getNativeData() );
 	}
 
-	/**
-	 * @covers WikiPage::getText
-	 */
-	public function testGetText() {
-		$this->hideDeprecated( "WikiPage::getText" );
-
-		$page = $this->newPage( "WikiPageTest_testGetText" );
-
-		$text = $page->getText();
-		$this->assertFalse( $text );
-
-		# -----------------
-		$this->createPage( $page, "some text", CONTENT_MODEL_WIKITEXT );
-
-		$text = $page->getText();
-		$this->assertEquals( "some text", $text );
-	}
-
 	/**
 	 * @covers WikiPage::getContentModel
 	 */