From c2b506a59f3ad1b8b4a7123b91a6b1395841743a Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 7 Jun 2018 11:40:46 -0700
Subject: [PATCH] Hard deprecate Interwiki static methods

Change-Id: I803df3ef90bf6b602e85ae48f25745f4dc6aab3a
---
 includes/interwiki/Interwiki.php                   | 4 ++++
 maintenance/populateInterwiki.php                  | 5 ++++-
 tests/phpunit/includes/interwiki/InterwikiTest.php | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index 657849adab..e6a943d3a0 100644
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -66,6 +66,7 @@ class Interwiki {
 	 * @return bool Whether it exists
 	 */
 	public static function isValidInterwiki( $prefix ) {
+		wfDeprecated( __METHOD__, '1.28' );
 		return MediaWikiServices::getInstance()->getInterwikiLookup()->isValidInterwiki( $prefix );
 	}
 
@@ -78,6 +79,7 @@ class Interwiki {
 	 * @return Interwiki|null|bool
 	 */
 	public static function fetch( $prefix ) {
+		wfDeprecated( __METHOD__, '1.28' );
 		return MediaWikiServices::getInstance()->getInterwikiLookup()->fetch( $prefix );
 	}
 
@@ -88,6 +90,7 @@ class Interwiki {
 	 * @since 1.26
 	 */
 	public static function invalidateCache( $prefix ) {
+		wfDeprecated( __METHOD__, '1.28' );
 		MediaWikiServices::getInstance()->getInterwikiLookup()->invalidateCache( $prefix );
 	}
 
@@ -101,6 +104,7 @@ class Interwiki {
 	 * @since 1.19
 	 */
 	public static function getAllPrefixes( $local = null ) {
+		wfDeprecated( __METHOD__, '1.28' );
 		return MediaWikiServices::getInstance()->getInterwikiLookup()->getAllPrefixes( $local );
 	}
 
diff --git a/maintenance/populateInterwiki.php b/maintenance/populateInterwiki.php
index 1b05e1ed03..acc66c5199 100644
--- a/maintenance/populateInterwiki.php
+++ b/maintenance/populateInterwiki.php
@@ -24,6 +24,8 @@
  * @author Katie Filbert < aude.wiki@gmail.com >
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 class PopulateInterwiki extends Maintenance {
@@ -119,6 +121,7 @@ TEXT
 			}
 		}
 
+		$lookup = MediaWikiServices::getInstance()->getInterwikiLookup();
 		foreach ( $data as $d ) {
 			$prefix = $d['prefix'];
 
@@ -142,7 +145,7 @@ TEXT
 				);
 			}
 
-			Interwiki::invalidateCache( $prefix );
+			$lookup->invalidateCache( $prefix );
 		}
 
 		$this->output( "Interwiki links are populated.\n" );
diff --git a/tests/phpunit/includes/interwiki/InterwikiTest.php b/tests/phpunit/includes/interwiki/InterwikiTest.php
index 0d41c520db..409805bab7 100644
--- a/tests/phpunit/includes/interwiki/InterwikiTest.php
+++ b/tests/phpunit/includes/interwiki/InterwikiTest.php
@@ -115,7 +115,7 @@ class InterwikiTest extends MediaWikiTestCase {
 		$this->assertSame( true, $interwiki->isLocal(), 'isLocal' );
 		$this->assertSame( false, $interwiki->isTranscludable(), 'isTranscludable' );
 
-		Interwiki::invalidateCache( 'de' );
+		$interwikiLookup->invalidateCache( 'de' );
 		$this->assertNotSame( $interwiki, $interwikiLookup->fetch( 'de' ), 'invalidate cache' );
 	}
 
-- 
2.20.1