From 84e0d10abd6f0b6136e73459b605d8a924150165 Mon Sep 17 00:00:00 2001 From: gerritbot Date: Sat, 19 Aug 2023 04:14:59 +0000 Subject: [PATCH] Replace some moved Title class uses, now MediaWiki\Title\Title Bug: T321681 Change-Id: I19ff201e3a109d5f6b755c6c0857f7b22d08d26d --- includes/Api/ApiEchoMute.php | 2 +- includes/Api/ApiEchoNotifications.php | 2 +- includes/Api/ApiEchoUnreadNotificationPages.php | 2 +- includes/Controller/NotificationController.php | 2 +- includes/Formatters/EchoEventPresentationModel.php | 2 +- includes/Formatters/EchoPageLinkedPresentationModel.php | 2 +- includes/Formatters/EchoPresentationModelSection.php | 2 +- includes/Formatters/EchoWelcomePresentationModel.php | 2 +- includes/Hooks.php | 2 +- includes/Jobs/NotificationDeleteJob.php | 2 +- includes/Jobs/NotificationJob.php | 2 +- includes/Mapper/NotificationMapper.php | 2 +- includes/Model/Event.php | 2 +- includes/Model/TargetPage.php | 2 +- includes/OnWikiList.php | 2 +- includes/SummaryParser.php | 2 +- includes/SuppressionRowUpdateGenerator.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/Api/ApiEchoMute.php b/includes/Api/ApiEchoMute.php index 9f08a712f..8539fbd05 100644 --- a/includes/Api/ApiEchoMute.php +++ b/includes/Api/ApiEchoMute.php @@ -6,8 +6,8 @@ use ApiBase; use ApiMain; use CentralIdLookup; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; use MediaWiki\User\UserOptionsManager; -use Title; use Wikimedia\ParamValidator\ParamValidator; class ApiEchoMute extends ApiBase { diff --git a/includes/Api/ApiEchoNotifications.php b/includes/Api/ApiEchoNotifications.php index d59492d03..25ee32b11 100644 --- a/includes/Api/ApiEchoNotifications.php +++ b/includes/Api/ApiEchoNotifications.php @@ -16,8 +16,8 @@ use MediaWiki\Extension\Notifications\Model\Notification; use MediaWiki\Extension\Notifications\NotifUser; use MediaWiki\Extension\Notifications\SeenTime; use MediaWiki\Extension\Notifications\Services; +use MediaWiki\Title\Title; use MediaWiki\WikiMap\WikiMap; -use Title; use User; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/Api/ApiEchoUnreadNotificationPages.php b/includes/Api/ApiEchoUnreadNotificationPages.php index 1604837c5..5f31a254a 100644 --- a/includes/Api/ApiEchoUnreadNotificationPages.php +++ b/includes/Api/ApiEchoUnreadNotificationPages.php @@ -11,9 +11,9 @@ use MediaWiki\Extension\Notifications\Services; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Page\PageRecord; use MediaWiki\Page\PageStore; +use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; use MediaWiki\WikiMap\WikiMap; -use Title; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/Controller/NotificationController.php b/includes/Controller/NotificationController.php index 54d6473a5..ef75cb375 100644 --- a/includes/Controller/NotificationController.php +++ b/includes/Controller/NotificationController.php @@ -21,8 +21,8 @@ use MediaWiki\Extension\Notifications\Services; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionStore; +use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; -use Title; use User; /** diff --git a/includes/Formatters/EchoEventPresentationModel.php b/includes/Formatters/EchoEventPresentationModel.php index 64a6ee056..01f43fa6e 100644 --- a/includes/Formatters/EchoEventPresentationModel.php +++ b/includes/Formatters/EchoEventPresentationModel.php @@ -9,12 +9,12 @@ use MediaWiki\Extension\Notifications\Controller\NotificationController; use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Title\Title; use MediaWiki\WikiMap\WikiMap; use Message; use MessageLocalizer; use MessageSpecifier; use SpecialPage; -use Title; use User; use Wikimedia\Timestamp\TimestampException; diff --git a/includes/Formatters/EchoPageLinkedPresentationModel.php b/includes/Formatters/EchoPageLinkedPresentationModel.php index f0b31fb9a..b72ae834e 100644 --- a/includes/Formatters/EchoPageLinkedPresentationModel.php +++ b/includes/Formatters/EchoPageLinkedPresentationModel.php @@ -5,8 +5,8 @@ namespace MediaWiki\Extension\Notifications\Formatters; use MediaWiki\Extension\Notifications\Controller\NotificationController; use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; use SpecialPage; -use Title; class EchoPageLinkedPresentationModel extends EchoEventPresentationModel { diff --git a/includes/Formatters/EchoPresentationModelSection.php b/includes/Formatters/EchoPresentationModelSection.php index fcddbe01c..2235e385f 100644 --- a/includes/Formatters/EchoPresentationModelSection.php +++ b/includes/Formatters/EchoPresentationModelSection.php @@ -7,8 +7,8 @@ use Language; use MediaWiki\Extension\Notifications\DiscussionParser; use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Title\Title; use Parser; -use Title; use User; /** diff --git a/includes/Formatters/EchoWelcomePresentationModel.php b/includes/Formatters/EchoWelcomePresentationModel.php index aadef7c3a..8a39adb26 100644 --- a/includes/Formatters/EchoWelcomePresentationModel.php +++ b/includes/Formatters/EchoWelcomePresentationModel.php @@ -2,7 +2,7 @@ namespace MediaWiki\Extension\Notifications\Formatters; -use Title; +use MediaWiki\Title\Title; class EchoWelcomePresentationModel extends EchoEventPresentationModel { diff --git a/includes/Hooks.php b/includes/Hooks.php index a73cbfccc..40081de04 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -52,6 +52,7 @@ use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\EditResult; use MediaWiki\Storage\Hook\PageSaveCompleteHook; +use MediaWiki\Title\Title; use MediaWiki\User\Hook\UserClearNewTalkNotificationHook; use MediaWiki\User\Hook\UserGetDefaultOptionsHook; use MediaWiki\User\Hook\UserGroupsChangedHook; @@ -65,7 +66,6 @@ use RecentChange; use Skin; use SkinTemplate; use SpecialPage; -use Title; use User; use WebRequest; use WikiPage; diff --git a/includes/Jobs/NotificationDeleteJob.php b/includes/Jobs/NotificationDeleteJob.php index 0dd56d2e1..0a476c5b4 100644 --- a/includes/Jobs/NotificationDeleteJob.php +++ b/includes/Jobs/NotificationDeleteJob.php @@ -6,7 +6,7 @@ use Job; use MediaWiki\Extension\Notifications\Mapper\NotificationMapper; use MediaWiki\Extension\Notifications\NotifUser; use MediaWiki\MediaWikiServices; -use Title; +use MediaWiki\Title\Title; use User; /** diff --git a/includes/Jobs/NotificationJob.php b/includes/Jobs/NotificationJob.php index 113196751..e2401fba2 100644 --- a/includes/Jobs/NotificationJob.php +++ b/includes/Jobs/NotificationJob.php @@ -5,7 +5,7 @@ namespace MediaWiki\Extension\Notifications\Jobs; use Job; use MediaWiki\Extension\Notifications\Controller\NotificationController; use MediaWiki\Extension\Notifications\Mapper\EventMapper; -use Title; +use MediaWiki\Title\Title; class NotificationJob extends Job { diff --git a/includes/Mapper/NotificationMapper.php b/includes/Mapper/NotificationMapper.php index cac67d999..4d325dfce 100644 --- a/includes/Mapper/NotificationMapper.php +++ b/includes/Mapper/NotificationMapper.php @@ -9,9 +9,9 @@ use Exception; use InvalidArgumentException; use MediaWiki\Extension\Notifications\Model\Notification; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use MWExceptionHandler; -use Title; use Wikimedia\Rdbms\IDatabase; /** diff --git a/includes/Model/Event.php b/includes/Model/Event.php index 675416a33..0a9feeb98 100644 --- a/includes/Model/Event.php +++ b/includes/Model/Event.php @@ -14,10 +14,10 @@ use MediaWiki\Extension\Notifications\Services; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use RuntimeException; use stdClass; -use Title; use User; /** diff --git a/includes/Model/TargetPage.php b/includes/Model/TargetPage.php index 410e03170..e6eb03ace 100644 --- a/includes/Model/TargetPage.php +++ b/includes/Model/TargetPage.php @@ -3,8 +3,8 @@ namespace MediaWiki\Extension\Notifications\Model; use InvalidArgumentException; +use MediaWiki\Title\Title; use stdClass; -use Title; /** * Map a title to an echo event so that we can mark a notification as read diff --git a/includes/OnWikiList.php b/includes/OnWikiList.php index 020b83137..dc72dd928 100644 --- a/includes/OnWikiList.php +++ b/includes/OnWikiList.php @@ -3,8 +3,8 @@ namespace MediaWiki\Extension\Notifications; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; use TextContent; -use Title; /** * Implements ContainmentList interface for sourcing a list of items from a wiki diff --git a/includes/SummaryParser.php b/includes/SummaryParser.php index 2fda1b753..f92f84d23 100644 --- a/includes/SummaryParser.php +++ b/includes/SummaryParser.php @@ -2,7 +2,7 @@ namespace MediaWiki\Extension\Notifications; -use Title; +use MediaWiki\Title\Title; use User; class SummaryParser { diff --git a/includes/SuppressionRowUpdateGenerator.php b/includes/SuppressionRowUpdateGenerator.php index d6927914e..9ab11b113 100644 --- a/includes/SuppressionRowUpdateGenerator.php +++ b/includes/SuppressionRowUpdateGenerator.php @@ -2,9 +2,9 @@ namespace MediaWiki\Extension\Notifications; +use MediaWiki\Title\Title; use RowUpdateGenerator; use stdClass; -use Title; /** * Performs updates required for respecting suppression within echo: