From e04d3a28f6c4341b7185a7f121bdfa90372a43df Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Sat, 6 May 2023 22:01:10 +0200 Subject: Replace internal Hooks::runner The Hooks class contains deprecated functions and the whole class is going to get removed, so remove the convenience function and inline the code. Bug: T335536 Change-Id: I8ef3468a64a0199996f26ef293543fcacdf2797f --- includes/cache/HTMLFileCache.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'includes/cache/HTMLFileCache.php') diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index d68031bcb437..c19b8f067bdb 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -22,6 +22,7 @@ */ use MediaWiki\Cache\CacheKeyHelper; +use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; @@ -93,7 +94,8 @@ class HTMLFileCache extends FileCacheBase { * @return bool */ public static function useFileCache( IContextSource $context, $mode = self::MODE_NORMAL ) { - $config = MediaWikiServices::getInstance()->getMainConfig(); + $services = MediaWikiServices::getInstance(); + $config = $services->getMainConfig(); if ( !$config->get( MainConfigNames::UseFileCache ) && $mode !== self::MODE_REBUILD ) { return false; @@ -125,18 +127,17 @@ class HTMLFileCache extends FileCacheBase { // Check that there are no other sources of variation if ( $user->isRegistered() || - !$ulang->equals( MediaWikiServices::getInstance()->getContentLanguage() ) ) { + !$ulang->equals( $services->getContentLanguage() ) ) { return false; } - $userHasNewMessages = MediaWikiServices::getInstance() - ->getTalkPageNotificationManager()->userHasNewMessages( $user ); + $userHasNewMessages = $services->getTalkPageNotificationManager()->userHasNewMessages( $user ); if ( ( $mode === self::MODE_NORMAL ) && $userHasNewMessages ) { return false; } // Allow extensions to disable caching - return Hooks::runner()->onHTMLFileCache__useFileCache( $context ); + return ( new HookRunner( $services->getHookContainer() ) )->onHTMLFileCache__useFileCache( $context ); } /** -- cgit v1.2.3