From 7bb88756964453fc3d66ce8027a59698eab7ad4c Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sun, 14 Mar 2021 05:06:15 +0000
Subject: [PATCH] Namespace extension

Change-Id: Ia510f65e739d21bcfd6072c82859109d05cf5dd1
---
 extension.json                             | 16 +++++++---------
 includes/{InterwikiHooks.php => Hooks.php} | 10 +++++++---
 includes/InterwikiLogFormatter.php         |  5 +++++
 includes/SpecialInterwiki.php              | 14 ++++++++++++--
 4 files changed, 31 insertions(+), 14 deletions(-)
 rename includes/{InterwikiHooks.php => Hooks.php} (94%)

diff --git a/extension.json b/extension.json
index 5e981d61..f076ae73 100644
--- a/extension.json
+++ b/extension.json
@@ -40,8 +40,8 @@
 		]
 	},
 	"Hooks": {
-		"InterwikiLoadPrefix": "InterwikiHooks::onInterwikiLoadPrefix",
-		"UserGetAllRights": "InterwikiHooks::onUserGetAllRights"
+		"InterwikiLoadPrefix": "MediaWiki\\Extension\\Interwiki\\Hooks::onInterwikiLoadPrefix",
+		"UserGetAllRights": "MediaWiki\\Extension\\Interwiki\\Hooks::onUserGetAllRights"
 	},
 	"ResourceModules": {
 		"ext.interwiki.specialpage": {
@@ -53,18 +53,16 @@
 		"remoteExtPath": "Interwiki/modules"
 	},
 	"SpecialPages": {
-		"Interwiki": "SpecialInterwiki"
+		"Interwiki": "MediaWiki\\Extension\\Interwiki\\SpecialInterwiki"
 	},
 	"ExtensionFunctions": [
-		"InterwikiHooks::onExtensionFunctions"
+		"MediaWiki\\Extension\\Interwiki\\Hooks::onExtensionFunctions"
 	],
-	"AutoloadClasses": {
-		"InterwikiHooks": "includes/InterwikiHooks.php",
-		"SpecialInterwiki": "includes/SpecialInterwiki.php",
-		"InterwikiLogFormatter": "includes/InterwikiLogFormatter.php"
+	"AutoloadNamespaces": {
+		"MediaWiki\\Extension\\Interwiki\\": "includes/"
 	},
 	"LogActionsHandlers": {
-		"interwiki/*": "InterwikiLogFormatter"
+		"interwiki/*": "MediaWiki\\Extension\\Interwiki\\InterwikiLogFormatter"
 	},
 	"manifest_version": 2
 }
diff --git a/includes/InterwikiHooks.php b/includes/Hooks.php
similarity index 94%
rename from includes/InterwikiHooks.php
rename to includes/Hooks.php
index aa538e3c..9f383c99 100644
--- a/includes/InterwikiHooks.php
+++ b/includes/Hooks.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Interwiki;
+
+use Hooks as MWHooks;
+use Language;
 use MediaWiki\MediaWikiServices;
 
-class InterwikiHooks {
+class Hooks {
 	/** @var bool */
 	private static $shouldSkipIWCheck = false;
 	/** @var bool */
@@ -37,8 +41,8 @@ class InterwikiHooks {
 			return;
 		}
 		// This will trigger a deprecation warning in MW 1.36+
-		Hooks::register(
-			'InterwikiLoadPrefix', 'InterwikiHooks::onInterwikiLoadPrefix'
+		MWHooks::register(
+			'InterwikiLoadPrefix', [ self::class, 'onInterwikiLoadPrefix' ]
 		);
 	}
 
diff --git a/includes/InterwikiLogFormatter.php b/includes/InterwikiLogFormatter.php
index 129ae627..d153326b 100644
--- a/includes/InterwikiLogFormatter.php
+++ b/includes/InterwikiLogFormatter.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Interwiki;
+
+use LogFormatter;
+use Message;
+
 /**
  * Needed to pass the URL as a raw parameter, because it contains $1
  */
diff --git a/includes/SpecialInterwiki.php b/includes/SpecialInterwiki.php
index bf02e1be..43564928 100644
--- a/includes/SpecialInterwiki.php
+++ b/includes/SpecialInterwiki.php
@@ -1,6 +1,17 @@
 <?php
 
+namespace MediaWiki\Extension\Interwiki;
+
+use Html;
+use HTMLForm;
+use Language;
+use LogPage;
 use MediaWiki\MediaWikiServices;
+use OutputPage;
+use PermissionsError;
+use ReadOnlyError;
+use SpecialPage;
+use Status;
 
 /**
  * Implements Special:Interwiki
@@ -481,8 +492,7 @@ class SpecialInterwiki extends SpecialPage {
 
 	protected function makeTable( $canModify, $iwPrefixes ) {
 		// Output the existing Interwiki prefixes table header
-		$out = '';
-		$out .= Html::openElement(
+		$out = Html::openElement(
 			'table',
 			[ 'class' => 'mw-interwikitable wikitable sortable body' ]
 		) . "\n";