diff options
| -rw-r--r-- | RELEASE-NOTES-1.42 | 16 | ||||
| -rw-r--r-- | autoload.php | 39 | ||||
| -rw-r--r-- | includes/HookContainer/HookRunner.php | 26 | ||||
| -rw-r--r-- | includes/Output/Hook/AfterBuildFeedLinksHook.php (renamed from includes/Hook/AfterBuildFeedLinksHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/AfterFinalPageOutputHook.php (renamed from includes/Hook/AfterFinalPageOutputHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/BeforePageDisplayHook.php (renamed from includes/Hook/BeforePageDisplayHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/BeforePageRedirectHook.php (renamed from includes/Hook/BeforePageRedirectHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/GetCacheVaryCookiesHook.php (renamed from includes/Hook/GetCacheVaryCookiesHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/LanguageLinksHook.php (renamed from includes/Hook/LanguageLinksHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/MakeGlobalVariablesScriptHook.php (renamed from includes/Hook/MakeGlobalVariablesScriptHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageAfterGetHeadLinksArrayHook.php (renamed from includes/Hook/OutputPageAfterGetHeadLinksArrayHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageBeforeHTMLHook.php (renamed from includes/Hook/OutputPageBeforeHTMLHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageBodyAttributesHook.php (renamed from includes/Hook/OutputPageBodyAttributesHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageCheckLastModifiedHook.php (renamed from includes/Hook/OutputPageCheckLastModifiedHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageMakeCategoryLinksHook.php (renamed from includes/Hook/OutputPageMakeCategoryLinksHook.php) | 7 | ||||
| -rw-r--r-- | includes/Output/Hook/OutputPageParserOutputHook.php (renamed from includes/Hook/OutputPageParserOutputHook.php) | 7 | ||||
| -rw-r--r-- | includes/api/ApiHookRunner.php | 6 |
17 files changed, 136 insertions, 42 deletions
diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42 index 2e3785cd76ca..a8403699d5f9 100644 --- a/RELEASE-NOTES-1.42 +++ b/RELEASE-NOTES-1.42 @@ -465,6 +465,22 @@ because of Phabricator reports. - UserOptionsLookup - UserOptionsManager - StaticUserOptionsLookup +* Some hook classes have been moved from the generic MediaWiki\Hooks namespace + to live closer to the code which uses them: + - MediaWiki\Output\Hook: + - AfterBuildFeedLinksHook + - AfterFinalPageOutputHook + - BeforePageDisplayHook + - BeforePageRedirectHook + - GetCacheVaryCookiesHook + - LanguageLinksHook + - MakeGlobalVariablesScriptHook + - OutputPageAfterGetHeadLinksArrayHook + - OutputPageBeforeHTMLHook + - OutputPageBodyAttributesHook + - OutputPageCheckLastModifiedHook + - OutputPageMakeCategoryLinksHook + - OutputPageParserOutputHook * API modules using ApiBase::requirePostedParameters() must also override mustBePosted() to return true. * Overriding MWException::getHTML(), ::getText(), ::getPageTitle(), and diff --git a/autoload.php b/autoload.php index cde0f3bdbe49..8e552b4379f0 100644 --- a/autoload.php +++ b/autoload.php @@ -1158,8 +1158,8 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\ActionBeforeFormDisplayHook' => __DIR__ . '/includes/actions/Hook/ActionBeforeFormDisplayHook.php', 'MediaWiki\\Hook\\ActionModifyFormFieldsHook' => __DIR__ . '/includes/actions/Hook/ActionModifyFormFieldsHook.php', 'MediaWiki\\Hook\\AddNewAccountHook' => __DIR__ . '/includes/specials/Hook/AddNewAccountHook.php', - 'MediaWiki\\Hook\\AfterBuildFeedLinksHook' => __DIR__ . '/includes/Hook/AfterBuildFeedLinksHook.php', - 'MediaWiki\\Hook\\AfterFinalPageOutputHook' => __DIR__ . '/includes/Hook/AfterFinalPageOutputHook.php', + 'MediaWiki\\Hook\\AfterBuildFeedLinksHook' => __DIR__ . '/includes/Output/Hook/AfterBuildFeedLinksHook.php', + 'MediaWiki\\Hook\\AfterFinalPageOutputHook' => __DIR__ . '/includes/Output/Hook/AfterFinalPageOutputHook.php', 'MediaWiki\\Hook\\AfterImportPageHook' => __DIR__ . '/includes/import/Hook/AfterImportPageHook.php', 'MediaWiki\\Hook\\AfterParserFetchFileAndTitleHook' => __DIR__ . '/includes/parser/Hook/AfterParserFetchFileAndTitleHook.php', 'MediaWiki\\Hook\\AlternateEditHook' => __DIR__ . '/includes/Hook/AlternateEditHook.php', @@ -1172,8 +1172,8 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\ArticleUpdateBeforeRedirectHook' => __DIR__ . '/includes/Hook/ArticleUpdateBeforeRedirectHook.php', 'MediaWiki\\Hook\\BadImageHook' => __DIR__ . '/includes/Hook/BadImageHook.php', 'MediaWiki\\Hook\\BeforeInitializeHook' => __DIR__ . '/includes/Hook/BeforeInitializeHook.php', - 'MediaWiki\\Hook\\BeforePageDisplayHook' => __DIR__ . '/includes/Hook/BeforePageDisplayHook.php', - 'MediaWiki\\Hook\\BeforePageRedirectHook' => __DIR__ . '/includes/Hook/BeforePageRedirectHook.php', + 'MediaWiki\\Hook\\BeforePageDisplayHook' => __DIR__ . '/includes/Output/Hook/BeforePageDisplayHook.php', + 'MediaWiki\\Hook\\BeforePageRedirectHook' => __DIR__ . '/includes/Output/Hook/BeforePageRedirectHook.php', 'MediaWiki\\Hook\\BeforeParserFetchFileAndTitleHook' => __DIR__ . '/includes/parser/Hook/BeforeParserFetchFileAndTitleHook.php', 'MediaWiki\\Hook\\BeforeParserFetchTemplateRevisionRecordHook' => __DIR__ . '/includes/parser/Hook/BeforeParserFetchTemplateRevisionRecordHook.php', 'MediaWiki\\Hook\\BeforeWelcomeCreationHook' => __DIR__ . '/includes/specials/Hook/BeforeWelcomeCreationHook.php', @@ -1237,7 +1237,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\FormatAutocommentsHook' => __DIR__ . '/includes/Hook/FormatAutocommentsHook.php', 'MediaWiki\\Hook\\GalleryGetModesHook' => __DIR__ . '/includes/gallery/Hook/GalleryGetModesHook.php', 'MediaWiki\\Hook\\GetBlockErrorMessageKeyHook' => __DIR__ . '/includes/Hook/GetBlockErrorMessageKeyHook.php', - 'MediaWiki\\Hook\\GetCacheVaryCookiesHook' => __DIR__ . '/includes/Hook/GetCacheVaryCookiesHook.php', + 'MediaWiki\\Hook\\GetCacheVaryCookiesHook' => __DIR__ . '/includes/Output/Hook/GetCacheVaryCookiesHook.php', 'MediaWiki\\Hook\\GetCanonicalURLHook' => __DIR__ . '/includes/Hook/GetCanonicalURLHook.php', 'MediaWiki\\Hook\\GetDefaultSortkeyHook' => __DIR__ . '/includes/Hook/GetDefaultSortkeyHook.php', 'MediaWiki\\Hook\\GetDoubleUnderscoreIDsHook' => __DIR__ . '/includes/Hook/GetDoubleUnderscoreIDsHook.php', @@ -1279,7 +1279,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\IsUploadAllowedFromUrlHook' => __DIR__ . '/includes/upload/Hook/IsUploadAllowedFromUrlHook.php', 'MediaWiki\\Hook\\IsValidEmailAddrHook' => __DIR__ . '/includes/parser/Hook/IsValidEmailAddrHook.php', 'MediaWiki\\Hook\\LanguageGetNamespacesHook' => __DIR__ . '/includes/language/Hook/LanguageGetNamespacesHook.php', - 'MediaWiki\\Hook\\LanguageLinksHook' => __DIR__ . '/includes/Hook/LanguageLinksHook.php', + 'MediaWiki\\Hook\\LanguageLinksHook' => __DIR__ . '/includes/Output/Hook/LanguageLinksHook.php', 'MediaWiki\\Hook\\LanguageSelectorHook' => __DIR__ . '/includes/specials/Hook/LanguageSelectorHook.php', 'MediaWiki\\Hook\\LinkerMakeExternalImageHook' => __DIR__ . '/includes/Hook/LinkerMakeExternalImageHook.php', 'MediaWiki\\Hook\\LinkerMakeExternalLinkHook' => __DIR__ . '/includes/Hook/LinkerMakeExternalLinkHook.php', @@ -1301,7 +1301,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\MaintenanceRefreshLinksInitHook' => __DIR__ . '/includes/Hook/MaintenanceRefreshLinksInitHook.php', 'MediaWiki\\Hook\\MaintenanceShellStartHook' => __DIR__ . '/includes/Hook/MaintenanceShellStartHook.php', 'MediaWiki\\Hook\\MaintenanceUpdateAddParamsHook' => __DIR__ . '/includes/Hook/MaintenanceUpdateAddParamsHook.php', - 'MediaWiki\\Hook\\MakeGlobalVariablesScriptHook' => __DIR__ . '/includes/Hook/MakeGlobalVariablesScriptHook.php', + 'MediaWiki\\Hook\\MakeGlobalVariablesScriptHook' => __DIR__ . '/includes/Output/Hook/MakeGlobalVariablesScriptHook.php', 'MediaWiki\\Hook\\ManualLogEntryBeforePublishHook' => __DIR__ . '/includes/logging/Hook/ManualLogEntryBeforePublishHook.php', 'MediaWiki\\Hook\\MarkPatrolledCompleteHook' => __DIR__ . '/includes/changes/Hook/MarkPatrolledCompleteHook.php', 'MediaWiki\\Hook\\MarkPatrolledHook' => __DIR__ . '/includes/changes/Hook/MarkPatrolledHook.php', @@ -1319,12 +1319,12 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Hook\\OpenSearchUrlsHook' => __DIR__ . '/includes/Hook/OpenSearchUrlsHook.php', 'MediaWiki\\Hook\\OtherAutoblockLogLinkHook' => __DIR__ . '/includes/specials/Hook/OtherAutoblockLogLinkHook.php', 'MediaWiki\\Hook\\OtherBlockLogLinkHook' => __DIR__ . '/includes/specials/Hook/OtherBlockLogLinkHook.php', - 'MediaWiki\\Hook\\OutputPageAfterGetHeadLinksArrayHook' => __DIR__ . '/includes/Hook/OutputPageAfterGetHeadLinksArrayHook.php', - 'MediaWiki\\Hook\\OutputPageBeforeHTMLHook' => __DIR__ . '/includes/Hook/OutputPageBeforeHTMLHook.php', - 'MediaWiki\\Hook\\OutputPageBodyAttributesHook' => __DIR__ . '/includes/Hook/OutputPageBodyAttributesHook.php', - 'MediaWiki\\Hook\\OutputPageCheckLastModifiedHook' => __DIR__ . '/includes/Hook/OutputPageCheckLastModifiedHook.php', - 'MediaWiki\\Hook\\OutputPageMakeCategoryLinksHook' => __DIR__ . '/includes/Hook/OutputPageMakeCategoryLinksHook.php', - 'MediaWiki\\Hook\\OutputPageParserOutputHook' => __DIR__ . '/includes/Hook/OutputPageParserOutputHook.php', + 'MediaWiki\\Hook\\OutputPageAfterGetHeadLinksArrayHook' => __DIR__ . '/includes/Output/Hook/OutputPageAfterGetHeadLinksArrayHook.php', + 'MediaWiki\\Hook\\OutputPageBeforeHTMLHook' => __DIR__ . '/includes/Output/Hook/OutputPageBeforeHTMLHook.php', + 'MediaWiki\\Hook\\OutputPageBodyAttributesHook' => __DIR__ . '/includes/Output/Hook/OutputPageBodyAttributesHook.php', + 'MediaWiki\\Hook\\OutputPageCheckLastModifiedHook' => __DIR__ . '/includes/Output/Hook/OutputPageCheckLastModifiedHook.php', + 'MediaWiki\\Hook\\OutputPageMakeCategoryLinksHook' => __DIR__ . '/includes/Output/Hook/OutputPageMakeCategoryLinksHook.php', + 'MediaWiki\\Hook\\OutputPageParserOutputHook' => __DIR__ . '/includes/Output/Hook/OutputPageParserOutputHook.php', 'MediaWiki\\Hook\\PageHistoryBeforeListHook' => __DIR__ . '/includes/actions/Hook/PageHistoryBeforeListHook.php', 'MediaWiki\\Hook\\PageHistoryLineEndingHook' => __DIR__ . '/includes/actions/Hook/PageHistoryLineEndingHook.php', 'MediaWiki\\Hook\\PageHistoryPager__doBatchLookupsHook' => __DIR__ . '/includes/actions/Hook/PageHistoryPager__doBatchLookupsHook.php', @@ -1620,6 +1620,19 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\OutputTransform\\Stages\\HandleTOCMarkers' => __DIR__ . '/includes/OutputTransform/Stages/HandleTOCMarkers.php', 'MediaWiki\\OutputTransform\\Stages\\HydrateHeaderPlaceholders' => __DIR__ . '/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php', 'MediaWiki\\OutputTransform\\Stages\\RenderDebugInfo' => __DIR__ . '/includes/OutputTransform/Stages/RenderDebugInfo.php', + 'MediaWiki\\Output\\Hook\\AfterBuildFeedLinksHook' => __DIR__ . '/includes/Output/Hook/AfterBuildFeedLinksHook.php', + 'MediaWiki\\Output\\Hook\\AfterFinalPageOutputHook' => __DIR__ . '/includes/Output/Hook/AfterFinalPageOutputHook.php', + 'MediaWiki\\Output\\Hook\\BeforePageDisplayHook' => __DIR__ . '/includes/Output/Hook/BeforePageDisplayHook.php', + 'MediaWiki\\Output\\Hook\\BeforePageRedirectHook' => __DIR__ . '/includes/Output/Hook/BeforePageRedirectHook.php', + 'MediaWiki\\Output\\Hook\\GetCacheVaryCookiesHook' => __DIR__ . '/includes/Output/Hook/GetCacheVaryCookiesHook.php', + 'MediaWiki\\Output\\Hook\\LanguageLinksHook' => __DIR__ . '/includes/Output/Hook/LanguageLinksHook.php', + 'MediaWiki\\Output\\Hook\\MakeGlobalVariablesScriptHook' => __DIR__ . '/includes/Output/Hook/MakeGlobalVariablesScriptHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageAfterGetHeadLinksArrayHook' => __DIR__ . '/includes/Output/Hook/OutputPageAfterGetHeadLinksArrayHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageBeforeHTMLHook' => __DIR__ . '/includes/Output/Hook/OutputPageBeforeHTMLHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageBodyAttributesHook' => __DIR__ . '/includes/Output/Hook/OutputPageBodyAttributesHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageCheckLastModifiedHook' => __DIR__ . '/includes/Output/Hook/OutputPageCheckLastModifiedHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageMakeCategoryLinksHook' => __DIR__ . '/includes/Output/Hook/OutputPageMakeCategoryLinksHook.php', + 'MediaWiki\\Output\\Hook\\OutputPageParserOutputHook' => __DIR__ . '/includes/Output/Hook/OutputPageParserOutputHook.php', 'MediaWiki\\Output\\IframeSandbox' => __DIR__ . '/includes/Output/IframeSandbox.php', 'MediaWiki\\Output\\IframeSandboxFactory' => __DIR__ . '/includes/Output/IframeSandboxFactory.php', 'MediaWiki\\Output\\OutputHandler' => __DIR__ . '/includes/Output/OutputHandler.php', diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index 85bd33bab662..30c1ec545665 100644 --- a/includes/HookContainer/HookRunner.php +++ b/includes/HookContainer/HookRunner.php @@ -107,8 +107,8 @@ class HookRunner implements \MediaWiki\Hook\ActionBeforeFormDisplayHook, \MediaWiki\Hook\ActionModifyFormFieldsHook, \MediaWiki\Hook\AddNewAccountHook, - \MediaWiki\Hook\AfterBuildFeedLinksHook, - \MediaWiki\Hook\AfterFinalPageOutputHook, + \MediaWiki\Output\Hook\AfterBuildFeedLinksHook, + \MediaWiki\Output\Hook\AfterFinalPageOutputHook, \MediaWiki\Hook\AfterImportPageHook, \MediaWiki\Hook\AfterParserFetchFileAndTitleHook, \MediaWiki\Hook\AlternateEditHook, @@ -121,8 +121,8 @@ class HookRunner implements \MediaWiki\Hook\ArticleUpdateBeforeRedirectHook, \MediaWiki\Hook\BadImageHook, \MediaWiki\Hook\BeforeInitializeHook, - \MediaWiki\Hook\BeforePageDisplayHook, - \MediaWiki\Hook\BeforePageRedirectHook, + \MediaWiki\Output\Hook\BeforePageDisplayHook, + \MediaWiki\Output\Hook\BeforePageRedirectHook, \MediaWiki\Hook\BeforeParserFetchFileAndTitleHook, \MediaWiki\Hook\BeforeParserFetchTemplateRevisionRecordHook, \MediaWiki\Hook\BeforeWelcomeCreationHook, @@ -188,7 +188,7 @@ class HookRunner implements \MediaWiki\Hook\FormatAutocommentsHook, \MediaWiki\Hook\GalleryGetModesHook, \MediaWiki\Hook\GetBlockErrorMessageKeyHook, - \MediaWiki\Hook\GetCacheVaryCookiesHook, + \MediaWiki\Output\Hook\GetCacheVaryCookiesHook, \MediaWiki\Hook\GetCanonicalURLHook, \MediaWiki\Hook\GetDefaultSortkeyHook, \MediaWiki\Hook\GetDoubleUnderscoreIDsHook, @@ -230,7 +230,7 @@ class HookRunner implements \MediaWiki\Hook\IsUploadAllowedFromUrlHook, \MediaWiki\Hook\IsValidEmailAddrHook, \MediaWiki\Hook\LanguageGetNamespacesHook, - \MediaWiki\Hook\LanguageLinksHook, + \MediaWiki\Output\Hook\LanguageLinksHook, \MediaWiki\Hook\LanguageSelectorHook, \MediaWiki\Hook\LinkerMakeExternalImageHook, \MediaWiki\Hook\LinkerMakeExternalLinkHook, @@ -252,7 +252,7 @@ class HookRunner implements \MediaWiki\Hook\MaintenanceRefreshLinksInitHook, \MediaWiki\Hook\MaintenanceShellStartHook, \MediaWiki\Hook\MaintenanceUpdateAddParamsHook, - \MediaWiki\Hook\MakeGlobalVariablesScriptHook, + \MediaWiki\Output\Hook\MakeGlobalVariablesScriptHook, \MediaWiki\Hook\ManualLogEntryBeforePublishHook, \MediaWiki\Hook\MarkPatrolledCompleteHook, \MediaWiki\Hook\MarkPatrolledHook, @@ -270,12 +270,12 @@ class HookRunner implements \MediaWiki\Hook\OpenSearchUrlsHook, \MediaWiki\Hook\OtherAutoblockLogLinkHook, \MediaWiki\Hook\OtherBlockLogLinkHook, - \MediaWiki\Hook\OutputPageAfterGetHeadLinksArrayHook, - \MediaWiki\Hook\OutputPageBeforeHTMLHook, - \MediaWiki\Hook\OutputPageBodyAttributesHook, - \MediaWiki\Hook\OutputPageCheckLastModifiedHook, - \MediaWiki\Hook\OutputPageMakeCategoryLinksHook, - \MediaWiki\Hook\OutputPageParserOutputHook, + \MediaWiki\Output\Hook\OutputPageAfterGetHeadLinksArrayHook, + \MediaWiki\Output\Hook\OutputPageBeforeHTMLHook, + \MediaWiki\Output\Hook\OutputPageBodyAttributesHook, + \MediaWiki\Output\Hook\OutputPageCheckLastModifiedHook, + \MediaWiki\Output\Hook\OutputPageMakeCategoryLinksHook, + \MediaWiki\Output\Hook\OutputPageParserOutputHook, \MediaWiki\Hook\PageHistoryBeforeListHook, \MediaWiki\Hook\PageHistoryLineEndingHook, \MediaWiki\Hook\PageHistoryPager__doBatchLookupsHook, diff --git a/includes/Hook/AfterBuildFeedLinksHook.php b/includes/Output/Hook/AfterBuildFeedLinksHook.php index ba17346e4b81..a3d392aeb569 100644 --- a/includes/Hook/AfterBuildFeedLinksHook.php +++ b/includes/Output/Hook/AfterBuildFeedLinksHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; /** * This is a hook handler interface, see docs/Hooks.md. @@ -22,3 +22,8 @@ interface AfterBuildFeedLinksHook { */ public function onAfterBuildFeedLinks( &$feedLinks ); } + +/** + * @deprecated since 1.42 + */ +class_alias( AfterBuildFeedLinksHook::class, 'MediaWiki\Hook\AfterBuildFeedLinksHook' ); diff --git a/includes/Hook/AfterFinalPageOutputHook.php b/includes/Output/Hook/AfterFinalPageOutputHook.php index 103eec98032a..0422a628def4 100644 --- a/includes/Hook/AfterFinalPageOutputHook.php +++ b/includes/Output/Hook/AfterFinalPageOutputHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -25,3 +25,8 @@ interface AfterFinalPageOutputHook { */ public function onAfterFinalPageOutput( $output ): void; } + +/** + * @deprecated since 1.42 + */ +class_alias( AfterFinalPageOutputHook::class, 'MediaWiki\Hook\AfterFinalPageOutputHook' ); diff --git a/includes/Hook/BeforePageDisplayHook.php b/includes/Output/Hook/BeforePageDisplayHook.php index ef65068aca0a..937b6f7b3ab0 100644 --- a/includes/Hook/BeforePageDisplayHook.php +++ b/includes/Output/Hook/BeforePageDisplayHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; use Skin; @@ -24,3 +24,8 @@ interface BeforePageDisplayHook { */ public function onBeforePageDisplay( $out, $skin ): void; } + +/** + * @deprecated since 1.42 + */ +class_alias( BeforePageDisplayHook::class, 'MediaWiki\Hook\BeforePageDisplayHook' ); diff --git a/includes/Hook/BeforePageRedirectHook.php b/includes/Output/Hook/BeforePageRedirectHook.php index d427beea8444..998be0a70d71 100644 --- a/includes/Hook/BeforePageRedirectHook.php +++ b/includes/Output/Hook/BeforePageRedirectHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -26,3 +26,8 @@ interface BeforePageRedirectHook { */ public function onBeforePageRedirect( $out, &$redirect, &$code ); } + +/** + * @deprecated since 1.42 + */ +class_alias( BeforePageRedirectHook::class, 'MediaWiki\Hook\BeforePageRedirectHook' ); diff --git a/includes/Hook/GetCacheVaryCookiesHook.php b/includes/Output/Hook/GetCacheVaryCookiesHook.php index 59c70ec520fd..f3a438cc6203 100644 --- a/includes/Hook/GetCacheVaryCookiesHook.php +++ b/includes/Output/Hook/GetCacheVaryCookiesHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -24,3 +24,8 @@ interface GetCacheVaryCookiesHook { */ public function onGetCacheVaryCookies( $out, &$cookies ); } + +/** + * @deprecated since 1.42 + */ +class_alias( GetCacheVaryCookiesHook::class, 'MediaWiki\Hook\GetCacheVaryCookiesHook' ); diff --git a/includes/Hook/LanguageLinksHook.php b/includes/Output/Hook/LanguageLinksHook.php index d67d714afca7..80ad58ea37c5 100644 --- a/includes/Hook/LanguageLinksHook.php +++ b/includes/Output/Hook/LanguageLinksHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Title\Title; @@ -29,3 +29,8 @@ interface LanguageLinksHook { */ public function onLanguageLinks( $title, &$links, &$linkFlags ); } + +/** + * @deprecated since 1.42 + */ +class_alias( LanguageLinksHook::class, 'MediaWiki\Hook\LanguageLinksHook' ); diff --git a/includes/Hook/MakeGlobalVariablesScriptHook.php b/includes/Output/Hook/MakeGlobalVariablesScriptHook.php index 6322e1797e6a..f984e41b6ad8 100644 --- a/includes/Hook/MakeGlobalVariablesScriptHook.php +++ b/includes/Output/Hook/MakeGlobalVariablesScriptHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -32,3 +32,8 @@ interface MakeGlobalVariablesScriptHook { */ public function onMakeGlobalVariablesScript( &$vars, $out ): void; } + +/** + * @deprecated since 1.42 + */ +class_alias( MakeGlobalVariablesScriptHook::class, 'MediaWiki\Hook\MakeGlobalVariablesScriptHook' ); diff --git a/includes/Hook/OutputPageAfterGetHeadLinksArrayHook.php b/includes/Output/Hook/OutputPageAfterGetHeadLinksArrayHook.php index 3c3d857d8dc2..dd917ada7ba8 100644 --- a/includes/Hook/OutputPageAfterGetHeadLinksArrayHook.php +++ b/includes/Output/Hook/OutputPageAfterGetHeadLinksArrayHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -25,3 +25,8 @@ interface OutputPageAfterGetHeadLinksArrayHook { */ public function onOutputPageAfterGetHeadLinksArray( &$tags, $out ); } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageAfterGetHeadLinksArrayHook::class, 'MediaWiki\Hook\OutputPageAfterGetHeadLinksArrayHook' ); diff --git a/includes/Hook/OutputPageBeforeHTMLHook.php b/includes/Output/Hook/OutputPageBeforeHTMLHook.php index ff11c2c5bf21..ac978bda91d4 100644 --- a/includes/Hook/OutputPageBeforeHTMLHook.php +++ b/includes/Output/Hook/OutputPageBeforeHTMLHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -24,3 +24,8 @@ interface OutputPageBeforeHTMLHook { */ public function onOutputPageBeforeHTML( $out, &$text ); } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageBeforeHTMLHook::class, 'MediaWiki\Hook\OutputPageBeforeHTMLHook' ); diff --git a/includes/Hook/OutputPageBodyAttributesHook.php b/includes/Output/Hook/OutputPageBodyAttributesHook.php index 850f979472f7..44b4877676cc 100644 --- a/includes/Hook/OutputPageBodyAttributesHook.php +++ b/includes/Output/Hook/OutputPageBodyAttributesHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; use Skin; @@ -28,3 +28,8 @@ interface OutputPageBodyAttributesHook { */ public function onOutputPageBodyAttributes( $out, $sk, &$bodyAttrs ): void; } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageBodyAttributesHook::class, 'MediaWiki\Hook\OutputPageBodyAttributesHook' ); diff --git a/includes/Hook/OutputPageCheckLastModifiedHook.php b/includes/Output/Hook/OutputPageCheckLastModifiedHook.php index 6f4e11a60f7c..e9447c33466a 100644 --- a/includes/Hook/OutputPageCheckLastModifiedHook.php +++ b/includes/Output/Hook/OutputPageCheckLastModifiedHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -25,3 +25,8 @@ interface OutputPageCheckLastModifiedHook { */ public function onOutputPageCheckLastModified( &$modifiedTimes, $out ); } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageCheckLastModifiedHook::class, 'MediaWiki\Hook\OutputPageCheckLastModifiedHook' ); diff --git a/includes/Hook/OutputPageMakeCategoryLinksHook.php b/includes/Output/Hook/OutputPageMakeCategoryLinksHook.php index 197eaacc9037..23685f94652e 100644 --- a/includes/Hook/OutputPageMakeCategoryLinksHook.php +++ b/includes/Output/Hook/OutputPageMakeCategoryLinksHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; @@ -27,3 +27,8 @@ interface OutputPageMakeCategoryLinksHook { */ public function onOutputPageMakeCategoryLinks( $out, $categories, &$links ); } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageMakeCategoryLinksHook::class, 'MediaWiki\Hook\OutputPageMakeCategoryLinksHook' ); diff --git a/includes/Hook/OutputPageParserOutputHook.php b/includes/Output/Hook/OutputPageParserOutputHook.php index 2f65ed974caf..f15d75449d1c 100644 --- a/includes/Hook/OutputPageParserOutputHook.php +++ b/includes/Output/Hook/OutputPageParserOutputHook.php @@ -1,6 +1,6 @@ <?php -namespace MediaWiki\Hook; +namespace MediaWiki\Output\Hook; use MediaWiki\Output\OutputPage; use MediaWiki\Parser\ParserOutput; @@ -24,3 +24,8 @@ interface OutputPageParserOutputHook { */ public function onOutputPageParserOutput( $outputPage, $parserOutput ): void; } + +/** + * @deprecated since 1.42 + */ +class_alias( OutputPageParserOutputHook::class, 'MediaWiki\Hook\OutputPageParserOutputHook' ); diff --git a/includes/api/ApiHookRunner.php b/includes/api/ApiHookRunner.php index cb29c57085bd..1c0c27ba08f3 100644 --- a/includes/api/ApiHookRunner.php +++ b/includes/api/ApiHookRunner.php @@ -48,9 +48,9 @@ class ApiHookRunner implements \MediaWiki\Hook\FileUndeleteCompleteHook, \MediaWiki\Hook\GetLinkColoursHook, \MediaWiki\Hook\ImportSourcesHook, - \MediaWiki\Hook\LanguageLinksHook, - \MediaWiki\Hook\OutputPageBeforeHTMLHook, - \MediaWiki\Hook\OutputPageCheckLastModifiedHook, + \MediaWiki\Output\Hook\LanguageLinksHook, + \MediaWiki\Output\Hook\OutputPageBeforeHTMLHook, + \MediaWiki\Output\Hook\OutputPageCheckLastModifiedHook, \MediaWiki\Hook\TempUserCreatedRedirectHook, \MediaWiki\Hook\UserLoginCompleteHook, \MediaWiki\Hook\UserLogoutCompleteHook, |