From b6becee5ebdcf182ae0b9e696084ad1842a3a603 Mon Sep 17 00:00:00 2001
From: Ammarpad <ammarpad@yahoo.com>
Date: Wed, 21 Jun 2023 23:08:36 +0100
Subject: [PATCH] Remove deprecated SkinTemplateNavigation hooks

 - SkinTemplateNavigation hook
 - SkinTemplateNavigation::SpecialPage hook

Bug: T339969
Change-Id: I0aa4a593ae5c795ca2f75234f379e5ad0efa48aa
---
 RELEASE-NOTES-1.41                            |  2 ++
 autoload.php                                  |  2 --
 includes/HookContainer/DeprecatedHooks.php    |  2 --
 includes/HookContainer/HookRunner.php         | 24 --------------
 .../skins/Hook/SkinTemplateNavigationHook.php | 30 ------------------
 ...kinTemplateNavigation__SpecialPageHook.php | 31 -------------------
 includes/skins/SkinTemplate.php               |  7 -----
 7 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 includes/skins/Hook/SkinTemplateNavigationHook.php
 delete mode 100644 includes/skins/Hook/SkinTemplateNavigation__SpecialPageHook.php

diff --git a/RELEASE-NOTES-1.41 b/RELEASE-NOTES-1.41
index 810712ec171..e28ef2a3460 100644
--- a/RELEASE-NOTES-1.41
+++ b/RELEASE-NOTES-1.41
@@ -210,6 +210,8 @@ because of Phabricator reports.
   deprecation.
 * SelectQueryBuilder::lockForUpdate(), deprecated in 1.40 and unused,
   has been removed without hard deprecation.
+* SkinTemplateNavigation and SkinTemplateNavigation::SpecialPage hooks,
+  deprecated in 1.39, have been removed.
 * …
 
 === Deprecations in 1.41 ===
diff --git a/autoload.php b/autoload.php
index 0ee174f2583..424963329ff 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1353,8 +1353,6 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Hook\\SkinPreloadExistenceHook' => __DIR__ . '/includes/skins/Hook/SkinPreloadExistenceHook.php',
 	'MediaWiki\\Hook\\SkinSubPageSubtitleHook' => __DIR__ . '/includes/skins/Hook/SkinSubPageSubtitleHook.php',
 	'MediaWiki\\Hook\\SkinTemplateGetLanguageLinkHook' => __DIR__ . '/includes/skins/Hook/SkinTemplateGetLanguageLinkHook.php',
-	'MediaWiki\\Hook\\SkinTemplateNavigationHook' => __DIR__ . '/includes/skins/Hook/SkinTemplateNavigationHook.php',
-	'MediaWiki\\Hook\\SkinTemplateNavigation__SpecialPageHook' => __DIR__ . '/includes/skins/Hook/SkinTemplateNavigation__SpecialPageHook.php',
 	'MediaWiki\\Hook\\SkinTemplateNavigation__UniversalHook' => __DIR__ . '/includes/skins/Hook/SkinTemplateNavigation__UniversalHook.php',
 	'MediaWiki\\Hook\\SoftwareInfoHook' => __DIR__ . '/includes/specials/Hook/SoftwareInfoHook.php',
 	'MediaWiki\\Hook\\SpecialBlockModifyFormFieldsHook' => __DIR__ . '/includes/specials/Hook/SpecialBlockModifyFormFieldsHook.php',
diff --git a/includes/HookContainer/DeprecatedHooks.php b/includes/HookContainer/DeprecatedHooks.php
index f75be4de0ba..1de5e8ef401 100644
--- a/includes/HookContainer/DeprecatedHooks.php
+++ b/includes/HookContainer/DeprecatedHooks.php
@@ -47,8 +47,6 @@ class DeprecatedHooks {
 		'userCan' => [ 'deprecatedVersion' => '1.37' ],
 		'ArticleDelete' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
 		'ArticleDeleteComplete' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
-		'SkinTemplateNavigation' => [ 'deprecatedVersion' => '1.39' ],
-		'SkinTemplateNavigation::SpecialPage' => [ 'deprecatedVersion' => '1.39' ],
 		'PersonalUrls' => [ 'deprecatedVersion' => '1.39' ],
 		'SearchDataForIndex' => [ 'deprecatedVersion' => '1.40', 'silent' => true ],
 		'ArticleUndelete' => [ 'deprecatedVersion' => '1.40', 'silent' => true ],
diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php
index 40160d005d4..3607c7b377d 100644
--- a/includes/HookContainer/HookRunner.php
+++ b/includes/HookContainer/HookRunner.php
@@ -335,8 +335,6 @@ class HookRunner implements
 	\MediaWiki\Hook\SkinPreloadExistenceHook,
 	\MediaWiki\Hook\SkinSubPageSubtitleHook,
 	\MediaWiki\Hook\SkinTemplateGetLanguageLinkHook,
-	\MediaWiki\Hook\SkinTemplateNavigationHook,
-	\MediaWiki\Hook\SkinTemplateNavigation__SpecialPageHook,
 	\MediaWiki\Hook\SkinTemplateNavigation__UniversalHook,
 	\MediaWiki\Hook\PersonalUrlsHook,
 	\MediaWiki\Hook\SoftwareInfoHook,
@@ -3591,28 +3589,6 @@ class HookRunner implements
 		);
 	}
 
-	/**
-	 * @deprecated since 1.39 Use onSkinTemplateNavigation__Universal instead
-	 */
-	public function onSkinTemplateNavigation( $sktemplate, &$links ): void {
-		$this->container->run(
-			'SkinTemplateNavigation',
-			[ $sktemplate, &$links ],
-			[ 'abortable' => false ]
-		);
-	}
-
-	/**
-	 * @deprecated since 1.39 Use onSkinTemplateNavigation__Universal instead
-	 */
-	public function onSkinTemplateNavigation__SpecialPage( $sktemplate, &$links ): void {
-		$this->container->run(
-			'SkinTemplateNavigation::SpecialPage',
-			[ $sktemplate, &$links ],
-			[ 'abortable' => false ]
-		);
-	}
-
 	public function onSkinTemplateNavigation__Universal( $sktemplate, &$links ): void {
 		$this->container->run(
 			'SkinTemplateNavigation::Universal',
diff --git a/includes/skins/Hook/SkinTemplateNavigationHook.php b/includes/skins/Hook/SkinTemplateNavigationHook.php
deleted file mode 100644
index b96f8cbe358..00000000000
--- a/includes/skins/Hook/SkinTemplateNavigationHook.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace MediaWiki\Hook;
-
-use SkinTemplate;
-
-/**
- * This is a hook handler interface, see docs/Hooks.md.
- * Use the hook name "SkinTemplateNavigation" to register handlers implementing this interface.
- *
- * @stable to implement
- * @ingroup Hooks
- * @deprecated since 1.39 Use SkinTemplateNavigation__Universal instead
- */
-interface SkinTemplateNavigationHook {
-	/**
-	 * This hook is called on content pages after the tabs have been
-	 * added, but before variants have been added.
-	 *
-	 * @since 1.35
-	 *
-	 * @param SkinTemplate $sktemplate
-	 * @param array &$links Structured navigation links. This is used to alter the navigation for
-	 *   skins which use buildNavigationUrls such as Vector.
-	 * @return void This hook must not abort, it must return no value
-	 *
-	 * @deprecated since 1.39 Use SkinTemplateNavigation__Universal::onSkinTemplateNavigation__Universal instead
-	 */
-	public function onSkinTemplateNavigation( $sktemplate, &$links ): void;
-}
diff --git a/includes/skins/Hook/SkinTemplateNavigation__SpecialPageHook.php b/includes/skins/Hook/SkinTemplateNavigation__SpecialPageHook.php
deleted file mode 100644
index e001f502fc0..00000000000
--- a/includes/skins/Hook/SkinTemplateNavigation__SpecialPageHook.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace MediaWiki\Hook;
-
-// phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use SkinTemplate;
-
-/**
- * This is a hook handler interface, see docs/Hooks.md.
- * Use the hook name "SkinTemplateNavigation::SpecialPage" to register handlers implementing this interface.
- *
- * @stable to implement
- * @ingroup Hooks
- * @deprecated since 1.39 Use SkinTemplateNavigation__Universal instead
- */
-interface SkinTemplateNavigation__SpecialPageHook {
-	/**
-	 * This hook is called on special pages after the special
-	 * tab is added but before variants have been added.
-	 *
-	 * @since 1.35
-	 *
-	 * @param SkinTemplate $sktemplate
-	 * @param array &$links Structured navigation links. This is used to alter the navigation for
-	 *   skins which use buildNavigationUrls such as Vector.
-	 * @return void This hook must not abort, it must return no value
-	 *
-	 * @deprecated since 1.39 Use SkinTemplateNavigation__Universal::onSkinTemplateNavigation__Universal instead
-	 */
-	public function onSkinTemplateNavigation__SpecialPage( $sktemplate, &$links ): void;
-}
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 6b2f07b7f62..779d1b84995 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -946,13 +946,6 @@ class SkinTemplate extends Skin {
 	protected function runOnSkinTemplateNavigationHooks( SkinTemplate $skin, &$content_navigation ) {
 		$beforeHookAssociatedPages = array_keys( $content_navigation['associated-pages'] );
 		$beforeHookNamespaces = array_keys( $content_navigation['namespaces'] );
-		$title = $this->getRelevantTitle();
-		if ( $title->canExist() ) {
-			$this->getHookRunner()->onSkinTemplateNavigation( $skin, $content_navigation );
-		} else {
-			$this->getHookRunner()->onSkinTemplateNavigation__SpecialPage(
-				$skin, $content_navigation );
-		}
 
 		// Equiv to SkinTemplateContentActions, run
 		$this->getHookRunner()->onSkinTemplateNavigation__Universal(