diff options
| -rw-r--r-- | RELEASE-NOTES-1.37 | 1 | ||||
| -rw-r--r-- | includes/HookContainer/DeprecatedHooks.php | 1 | ||||
| -rw-r--r-- | includes/HookContainer/HookRunner.php | 10 | ||||
| -rw-r--r-- | includes/content/AbstractContent.php | 2 | ||||
| -rw-r--r-- | includes/content/Hook/SecondaryDataUpdatesHook.php | 34 |
5 files changed, 1 insertions, 47 deletions
diff --git a/RELEASE-NOTES-1.37 b/RELEASE-NOTES-1.37 index d290a4e1ab3f..ad7d1847beb2 100644 --- a/RELEASE-NOTES-1.37 +++ b/RELEASE-NOTES-1.37 @@ -345,6 +345,7 @@ because of Phabricator reports. All extensions that extend this class or use this method were updated to be ready to the new behavior. * ResultWrapper is now abstract. It cannot be directly constructed (T286694). +* The SecondaryDataUpdates hook, deprecated in 1.32, was removed entirely. * … === Deprecations in 1.37 === diff --git a/includes/HookContainer/DeprecatedHooks.php b/includes/HookContainer/DeprecatedHooks.php index 7fb56778a50d..8f3645f0af99 100644 --- a/includes/HookContainer/DeprecatedHooks.php +++ b/includes/HookContainer/DeprecatedHooks.php @@ -52,7 +52,6 @@ class DeprecatedHooks { 'ProtectionForm::buildForm' => [ 'deprecatedVersion' => '1.36', 'silent' => true ], 'ResourceLoaderTestModules' => [ 'deprecatedVersion' => '1.33' ], 'RollbackComplete' => [ 'deprecatedVersion' => '1.36', 'silent' => true ], - 'SecondaryDataUpdates' => [ 'deprecatedVersion' => '1.32', 'silent' => true ], 'SpecialMuteSubmit' => [ 'deprecatedVersion' => '1.35', 'silent' => true ], 'SkinTemplateOutputPageBeforeExec' => [ 'deprecatedVersion' => '1.35' ], 'SkinTemplateToolboxEnd' => [ 'deprecatedVersion' => '1.35' ], diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index ee7e00195998..36dfdac51219 100644 --- a/includes/HookContainer/HookRunner.php +++ b/includes/HookContainer/HookRunner.php @@ -66,7 +66,6 @@ class HookRunner implements \MediaWiki\Content\Hook\PageContentLanguageHook, \MediaWiki\Content\Hook\PlaceNewSectionHook, \MediaWiki\Content\Hook\SearchDataForIndexHook, - \MediaWiki\Content\Hook\SecondaryDataUpdatesHook, \MediaWiki\Diff\Hook\AbortDiffCacheHook, \MediaWiki\Diff\Hook\ArticleContentOnDiffHook, \MediaWiki\Diff\Hook\DifferenceEngineAfterLoadNewTextHook, @@ -3260,15 +3259,6 @@ class HookRunner implements ); } - public function onSecondaryDataUpdates( $title, $oldContent, $recursive, - $parserOutput, &$updates - ) { - return $this->container->run( - 'SecondaryDataUpdates', - [ $title, $oldContent, $recursive, $parserOutput, &$updates ] - ); - } - public function onSecuritySensitiveOperationStatus( &$status, $operation, $session, $timeSinceAuth ) { diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php index d94ebcae5093..51529155a7d4 100644 --- a/includes/content/AbstractContent.php +++ b/includes/content/AbstractContent.php @@ -297,8 +297,6 @@ abstract class AbstractContent implements Content { new LinksUpdate( $title, $parserOutput, $recursive ) ]; - Hooks::runner()->onSecondaryDataUpdates( $title, $old, $recursive, $parserOutput, $updates ); - return $updates; } diff --git a/includes/content/Hook/SecondaryDataUpdatesHook.php b/includes/content/Hook/SecondaryDataUpdatesHook.php deleted file mode 100644 index f81ac53e7543..000000000000 --- a/includes/content/Hook/SecondaryDataUpdatesHook.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php - -namespace MediaWiki\Content\Hook; - -use Content; -use DataUpdate; -use ParserOutput; -use Title; - -/** - * This is a hook handler interface, see docs/Hooks.md. - * Use the hook name "SecondaryDataUpdates" to register handlers implementing this interface. - * - * @deprecated since 1.32 Use RevisionDataUpdates or override - * ContentHandler::getSecondaryDataUpdates instead. - * @ingroup Hooks - */ -interface SecondaryDataUpdatesHook { - /** - * Use this hook to modify the list of DataUpdates to perform when page content is modified. - * - * @param Title $title Title of the page that is being edited - * @param Content $oldContent Page content before the edit - * @param bool $recursive Whether DataUpdates should trigger recursive updates - * (relevant mostly for LinksUpdate) - * @param ParserOutput $parserOutput Rendered version of the page after the edit - * @param DataUpdate[] &$updates List of DataUpdate objects, to be modified or replaced by - * the hook handler - * @return bool|void True or no return value to continue or false to abort - */ - public function onSecondaryDataUpdates( $title, $oldContent, $recursive, - $parserOutput, &$updates - ); -} |