diff options
Diffstat (limited to 'includes')
26 files changed, 27 insertions, 11 deletions
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index e06d866a6165..94966c631e01 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -25,6 +25,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Libs\UnpackFailedException; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\ProcOpenError; use MediaWiki\Request\WebRequest; use MediaWiki\Shell\Shell; diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index f028e6f05a1b..15da1e738a3b 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -169,11 +169,11 @@ use MediaWiki\User\ActorStoreFactory; use MediaWiki\User\BotPasswordStore; use MediaWiki\User\CentralId\CentralIdLookup; use MediaWiki\User\CentralId\CentralIdLookupFactory; +use MediaWiki\User\Options\StaticUserOptionsLookup; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\Options\UserOptionsManager; use MediaWiki\User\PasswordReset; use MediaWiki\User\Registration\UserRegistrationLookup; -use MediaWiki\User\StaticUserOptionsLookup; use MediaWiki\User\TalkPageNotificationManager; use MediaWiki\User\TempUser\RealTempUserConfig; use MediaWiki\User\TempUser\TempUserCreator; diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 5347c49dfc6a..c59c7e090450 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -127,6 +127,7 @@ use MediaWiki\Mail\EmailUserFactory; use MediaWiki\Mail\IEmailer; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Message\MessageFormatterFactory; use MediaWiki\OutputTransform\DefaultOutputPipelineFactory; use MediaWiki\OutputTransform\OutputTransformPipeline; diff --git a/includes/Setup.php b/includes/Setup.php index 2696755b5e23..cda29077c18e 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -61,6 +61,7 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Request\HeaderCallback; use MediaWiki\Settings\DynamicDefaultValues; use MediaWiki\Settings\LocalSettingsLoader; diff --git a/includes/cache/BacklinkCacheFactory.php b/includes/cache/BacklinkCacheFactory.php index f703739988cb..e51dff5822dc 100644 --- a/includes/cache/BacklinkCacheFactory.php +++ b/includes/cache/BacklinkCacheFactory.php @@ -23,7 +23,6 @@ namespace MediaWiki\Cache; -use BacklinkCache; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Linker\LinksMigration; diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index afa5cf498c01..7c6a3127d2ae 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -22,6 +22,7 @@ */ use MediaWiki\Cache\CacheKeyHelper; +use MediaWiki\Cache\FileCacheBase; use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; diff --git a/includes/cache/LinkBatchFactory.php b/includes/cache/LinkBatchFactory.php index f032789642a6..cd728d1037a4 100644 --- a/includes/cache/LinkBatchFactory.php +++ b/includes/cache/LinkBatchFactory.php @@ -23,10 +23,7 @@ namespace MediaWiki\Cache; -use GenderCache; use Language; -use LinkBatch; -use LinkCache; use MediaWiki\Linker\LinksMigration; use MediaWiki\Linker\LinkTarget; use MediaWiki\Page\PageReference; diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index 94c1d6362123..5884fc316684 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -28,6 +28,7 @@ use MediaWiki\Html\Html; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Parser\Sanitizer; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionStatus; diff --git a/includes/content/ContentModelChange.php b/includes/content/ContentModelChange.php index 75328d25b0fe..ec7f5c213443 100644 --- a/includes/content/ContentModelChange.php +++ b/includes/content/ContentModelChange.php @@ -6,6 +6,7 @@ use MediaWiki\Context\IContextSource; use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Message\Message; use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionStatus; diff --git a/includes/content/MessageContent.php b/includes/content/MessageContent.php index bf656d24c058..0c8f8bd491c4 100644 --- a/includes/content/MessageContent.php +++ b/includes/content/MessageContent.php @@ -26,6 +26,8 @@ * @author Daniel Kinzler */ +use MediaWiki\Message\Message; + /** * Wrapper allowing us to handle a system message as a Content object. * Note that this is generally *not* used to represent content from the diff --git a/includes/debug/MW.php b/includes/debug/MW.php index d67c0dd02d6b..7a6a28c08859 100644 --- a/includes/debug/MW.php +++ b/includes/debug/MW.php @@ -2,6 +2,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Title\Title; use MediaWiki\User\User; /** diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index a02ab51e41b5..c32153d07bf2 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -33,6 +33,7 @@ use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Page\ParserOutputAccess; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Permissions\Authority; diff --git a/includes/diff/DifferenceEngineSlotDiffRenderer.php b/includes/diff/DifferenceEngineSlotDiffRenderer.php index 683d359f7d39..62cf49f6ca47 100644 --- a/includes/diff/DifferenceEngineSlotDiffRenderer.php +++ b/includes/diff/DifferenceEngineSlotDiffRenderer.php @@ -20,6 +20,7 @@ * @file * @ingroup DifferenceEngine */ +use MediaWiki\Context\DerivativeContext; use MediaWiki\MediaWikiServices; use MediaWiki\Output\OutputPage; diff --git a/includes/filerepo/ThumbnailEntryPoint.php b/includes/filerepo/ThumbnailEntryPoint.php index 406b8366109e..54fb035411f4 100644 --- a/includes/filerepo/ThumbnailEntryPoint.php +++ b/includes/filerepo/ThumbnailEntryPoint.php @@ -40,13 +40,13 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiEntryPoint; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Permissions\PermissionStatus; use MediaWiki\PoolCounter\PoolCounterWorkViaCallback; use MediaWiki\Profiler\ProfilingContext; use MediaWiki\Request\HeaderCallback; use MediaWiki\Status\Status; use MediaWiki\Title\Title; -use Message; use MessageSpecifier; use RepoGroup; use UnregisteredLocalFile; diff --git a/includes/installer/ConnectionStatus.php b/includes/installer/ConnectionStatus.php index 2e255f4204b4..a6532045ddb5 100644 --- a/includes/installer/ConnectionStatus.php +++ b/includes/installer/ConnectionStatus.php @@ -2,7 +2,7 @@ namespace MediaWiki\Installer; -use Status; +use MediaWiki\Status\Status; use Wikimedia\Rdbms\Database; /** diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 5b32fc8afedb..5e1391ffbddc 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -55,7 +55,7 @@ use MediaWiki\Settings\SettingsBuilder; use MediaWiki\Status\Status; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\Title\Title; -use MediaWiki\User\StaticUserOptionsLookup; +use MediaWiki\User\Options\StaticUserOptionsLookup; use MediaWiki\User\User; use MediaWiki\Utils\UrlUtils; use MessageSpecifier; diff --git a/includes/language/Language.php b/includes/language/Language.php index 9365a55e9b6f..b80027c23850 100644 --- a/includes/language/Language.php +++ b/includes/language/Language.php @@ -43,6 +43,7 @@ use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Parser\MagicWord; use MediaWiki\Title\NamespaceInfo; use MediaWiki\User\User; diff --git a/includes/language/LocalisationCache.php b/includes/language/LocalisationCache.php index 5470a7309778..6dddcc3a5053 100644 --- a/includes/language/LocalisationCache.php +++ b/includes/language/LocalisationCache.php @@ -20,6 +20,7 @@ use CLDRPluralRuleParser\Error as CLDRPluralRuleError; use CLDRPluralRuleParser\Evaluator; +use MediaWiki\Config\ConfigException; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; diff --git a/includes/language/MessageLocalizer.php b/includes/language/MessageLocalizer.php index b90006c58c2a..ffac76045f71 100644 --- a/includes/language/MessageLocalizer.php +++ b/includes/language/MessageLocalizer.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Message\Message; + /** * Interface for localizing messages in MediaWiki * diff --git a/includes/objectcache/ObjectCacheFactory.php b/includes/objectcache/ObjectCacheFactory.php index d28da70c6571..50099f427376 100644 --- a/includes/objectcache/ObjectCacheFactory.php +++ b/includes/objectcache/ObjectCacheFactory.php @@ -19,6 +19,7 @@ */ use MediaWiki\Config\ServiceOptions; +use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Http\Telemetry; use MediaWiki\Logger\Spi; use MediaWiki\MainConfigNames; diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php index 0f441e5003b4..eaa992abeafb 100644 --- a/includes/session/SessionProvider.php +++ b/includes/session/SessionProvider.php @@ -32,6 +32,7 @@ use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; +use MediaWiki\Message\Message; use MediaWiki\Request\WebRequest; use MediaWiki\User\User; use MediaWiki\User\UserNameUtils; @@ -625,7 +626,7 @@ abstract class SessionProvider implements Stringable, SessionProviderInterface { * @warning This will be called early during MediaWiki startup. Do not * use $wgUser, $wgLang, $wgOut, the global Parser, or their equivalents via * RequestContext from this method! - * @return \Message + * @return Message */ protected function describeMessage() { return wfMessage( diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php index 07be7928e3a8..8f1876e9ae4c 100644 --- a/includes/skins/BaseTemplate.php +++ b/includes/skins/BaseTemplate.php @@ -19,6 +19,7 @@ */ use MediaWiki\Html\Html; +use MediaWiki\Message\Message; use MediaWiki\Parser\Sanitizer; /** diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index d372b79fda78..fd1faed4e5f5 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -25,6 +25,7 @@ use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Permissions\Authority; use MediaWiki\ResourceLoader as RL; use MediaWiki\Skin\SkinComponentUtils; diff --git a/includes/user/BotPassword.php b/includes/user/BotPassword.php index 95c52f3b1418..0d90586b28a6 100644 --- a/includes/user/BotPassword.php +++ b/includes/user/BotPassword.php @@ -21,7 +21,6 @@ namespace MediaWiki\User; use IDBAccessObject; -use InvalidPassword; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\Throttler; use MediaWiki\Config\Config; @@ -29,6 +28,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Password\InvalidPassword; use MediaWiki\Password\Password; use MediaWiki\Password\PasswordError; use MediaWiki\Password\PasswordFactory; diff --git a/includes/utils/MWRestrictions.php b/includes/utils/MWRestrictions.php index 40ec75fabb2c..e593af98efcb 100644 --- a/includes/utils/MWRestrictions.php +++ b/includes/utils/MWRestrictions.php @@ -22,6 +22,7 @@ use MediaWiki\Json\FormatJson; use MediaWiki\Linker\LinkTarget; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; +use MediaWiki\Title\Title; use Wikimedia\IPSet; use Wikimedia\IPUtils; diff --git a/includes/xml/Xml.php b/includes/xml/Xml.php index 2130fb2de7e6..c048592c7d87 100644 --- a/includes/xml/Xml.php +++ b/includes/xml/Xml.php @@ -26,9 +26,9 @@ use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Message\Message; use MediaWiki\Parser\Sanitizer; use MediaWiki\Utils\MWTimestamp; -use Message; use UtfNormal\Validator; /** |