From b91cbed2eda3200c8607dc82b0fd40dc9c974a52 Mon Sep 17 00:00:00 2001
From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Sat, 2 Apr 2016 10:34:18 +0200
Subject: [PATCH] Remove Title::newFromRedirectRecurse()

Bug: T122754
Change-Id: I8b957eff7f355493ef6850f7a83dcb619ab6be78
---
 RELEASE-NOTES-1.27                              |  1 +
 includes/Title.php                              | 17 -----------------
 .../includes/content/JavaScriptContentTest.php  | 10 ----------
 .../includes/content/TextContentTest.php        | 10 ----------
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0aebf38710..b6bb950d4e 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -403,6 +403,7 @@ changes to languages because of Phabricator reports.
 * Title::newFromRedirectArray() was removed (deprecated in 1.21).
 * UserMailer::send() no longer accepts $replyto as the 5th argument and $contentType
   as the 6th. These must be passed in the options array now.
+* Title::newFromRedirectRecurse() was removed (deprecated in 1.21).
 
 == Compatibility ==
 
diff --git a/includes/Title.php b/includes/Title.php
index a6163f0963..f4a6894a40 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -572,23 +572,6 @@ class Title implements LinkTarget {
 		return $title;
 	}
 
-	/**
-	 * Extract a redirect destination from a string and return the
-	 * Title, or null if the text doesn't contain a valid redirect
-	 * This will recurse down $wgMaxRedirects times or until a non-redirect target is hit
-	 * in order to provide (hopefully) the Title of the final destination instead of another redirect
-	 *
-	 * @param string $text Text with possible redirect
-	 * @return Title
-	 * @deprecated since 1.21, use Content::getUltimateRedirectTarget instead.
-	 */
-	public static function newFromRedirectRecurse( $text ) {
-		ContentHandler::deprecated( __METHOD__, '1.21' );
-
-		$content = ContentHandler::makeContent( $text, null, CONTENT_MODEL_WIKITEXT );
-		return $content->getUltimateRedirectTarget();
-	}
-
 	/**
 	 * Get the prefixed DB key associated with an ID
 	 *
diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php
index 97e0b1c0ec..1c746bcdda 100644
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -141,16 +141,6 @@ class JavaScriptContentTest extends TextContentTest {
 		];
 	}
 
-	/**
-	 * @todo Test needs database!
-	 */
-	/*
-	public function getUltimateRedirectTarget() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectRecurse( $text );
-	}
-	*/
-
 	public static function dataIsCountable() {
 		return [
 			[ '',
diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php
index d89f3eb26a..ac8342826c 100644
--- a/tests/phpunit/includes/content/TextContentTest.php
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -180,16 +180,6 @@ class TextContentTest extends MediaWikiLangTestCase {
 		$this->assertEquals( !is_null( $expected ), $content->isRedirect() );
 	}
 
-	/**
-	 * @todo Test needs database! Should be done by a test class in the Database group.
-	 */
-	/*
-	public function getUltimateRedirectTarget() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectRecurse( $text );
-	}
-	*/
-
 	public static function dataIsCountable() {
 		return [
 			[ '',
-- 
2.20.1