diff options
Diffstat (limited to 'includes')
33 files changed, 45 insertions, 12 deletions
diff --git a/includes/CommentFormatter/CommentParser.php b/includes/CommentFormatter/CommentParser.php index a91d06f1042b..7ce16ffc5ab1 100644 --- a/includes/CommentFormatter/CommentParser.php +++ b/includes/CommentFormatter/CommentParser.php @@ -14,6 +14,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Linker\LinkTarget; +use MediaWiki\WikiMap\WikiMap; use NamespaceInfo; use Parser; use RepoGroup; @@ -296,7 +297,7 @@ class CommentParser { ) { if ( $wikiId !== null && $wikiId !== false && !$target->isExternal() ) { return Linker::makeExternalLink( - \WikiMap::getForeignURL( + WikiMap::getForeignURL( $wikiId, $target->getNamespace() === 0 ? $target->getDBkey() @@ -464,7 +465,7 @@ class CommentParser { if ( $wikiId !== null && $wikiId !== false && !$target->isExternal() ) { // Handle links from a foreign wiki ID return Linker::makeExternalLink( - \WikiMap::getForeignURL( + WikiMap::getForeignURL( $wikiId, $target->getNamespace() === 0 ? $target->getDBkey() diff --git a/includes/DevelopmentSettings.php b/includes/DevelopmentSettings.php index d0091fc970e1..4d6be036755a 100644 --- a/includes/DevelopmentSettings.php +++ b/includes/DevelopmentSettings.php @@ -30,6 +30,8 @@ */ // Enable showing of errors +use MediaWiki\WikiMap\WikiMap; + error_reporting( -1 ); // @phan-suppress-next-line PhanTypeMismatchArgumentInternal Scalar okay with php8.1 ini_set( 'display_errors', 1 ); diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index c3f22ad62a44..de3c23c53965 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -27,6 +27,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\PermissionStatus; use MediaWiki\Request\DerivativeRequest; +use MediaWiki\WikiMap\WikiMap; use Psr\Log\LoggerInterface; use Wikimedia\AtEase\AtEase; use Wikimedia\Rdbms\ChronologyProtector; diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php index f8b6a730b982..9aa2c3fb6db6 100644 --- a/includes/ResourceLoader/ResourceLoader.php +++ b/includes/ResourceLoader/ResourceLoader.php @@ -39,6 +39,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Request\HeaderCallback; use MediaWiki\User\UserOptionsLookup; +use MediaWiki\WikiMap\WikiMap; use MWException; use MWExceptionHandler; use MWExceptionRenderer; @@ -55,7 +56,6 @@ use Throwable; use Title; use UnexpectedValueException; use WebRequest; -use WikiMap; use Wikimedia\DependencyStore\DependencyStore; use Wikimedia\DependencyStore\KeyValueDependencyStore; use Wikimedia\Minify\CSSMin; diff --git a/includes/Rest/Handler/ParsoidHandler.php b/includes/Rest/Handler/ParsoidHandler.php index f083c87706c9..8a6f98540279 100644 --- a/includes/Rest/Handler/ParsoidHandler.php +++ b/includes/Rest/Handler/ParsoidHandler.php @@ -42,10 +42,10 @@ use MediaWiki\Rest\ResponseException; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\SlotRecord; +use MediaWiki\WikiMap\WikiMap; use MobileContext; use RequestContext; use Title; -use WikiMap; use Wikimedia\Http\HttpAcceptParser; use Wikimedia\Message\DataMessageValue; use Wikimedia\Parsoid\Config\DataAccess; diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index cf468809a651..ca8e304b29c6 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -193,6 +193,7 @@ use MediaWiki\User\UserOptionsLookup; use MediaWiki\User\UserOptionsManager; use MediaWiki\Utils\UrlUtils; use MediaWiki\Watchlist\WatchlistManager; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\DependencyStore\KeyValueDependencyStore; use Wikimedia\DependencyStore\SqlModuleDependencyStore; use Wikimedia\Message\IMessageFormatterFactory; diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php index 2a8df037151b..88d22f152de4 100644 --- a/includes/SiteConfiguration.php +++ b/includes/SiteConfiguration.php @@ -19,6 +19,7 @@ */ use MediaWiki\Shell\Shell; +use MediaWiki\WikiMap\WikiMap; /** * Configuration holder, particularly for multi-wiki sites. diff --git a/includes/WikiMap.php b/includes/WikiMap/WikiMap.php index d24507d7abc6..71a2ec6862ba 100644 --- a/includes/WikiMap.php +++ b/includes/WikiMap/WikiMap.php @@ -20,8 +20,11 @@ * @file */ +namespace MediaWiki\WikiMap; + use MediaWiki\Linker\Linker; use MediaWiki\MediaWikiServices; +use MediaWikiSite; use Wikimedia\Rdbms\DatabaseDomain; /** @@ -319,3 +322,5 @@ class WikiMap { return ( self::getCurrentWikiId() === $wikiId ); } } + +class_alias( WikiMap::class, 'WikiMap' ); diff --git a/includes/WikiReference.php b/includes/WikiMap/WikiReference.php index eeede1b0a0e7..8e86dc9f4001 100644 --- a/includes/WikiReference.php +++ b/includes/WikiMap/WikiReference.php @@ -20,6 +20,8 @@ * @file */ +namespace MediaWiki\WikiMap; + /** * Reference to a locally-hosted wiki */ @@ -118,7 +120,8 @@ class WikiReference { * @return string URL */ public function getFullUrl( $page, $fragmentId = null ) { - return $this->mServer . - $this->getLocalUrl( $page, $fragmentId ); + return $this->mServer . $this->getLocalUrl( $page, $fragmentId ); } } + +class_alias( WikiReference::class, 'WikiReference' ); diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index f1843f14b2ee..d7d91371250e 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -34,6 +34,7 @@ use MediaWiki\Rest\HeaderParser\Origin; use MediaWiki\Session\SessionManager; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\User\UserRigorOptions; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\AtEase\AtEase; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\Timestamp\TimestampException; diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 125585e8e5d1..c7b1918e258d 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -35,6 +35,7 @@ use MediaWiki\Request\FauxRequest; use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\EnumDef; diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index 7790b2e85436..166950584fa2 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -32,6 +32,7 @@ use MediaWiki\ResourceLoader\SkinModule; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserOptionsLookup; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\Rdbms\ILoadBalancer; diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php index 8acc2ec30240..00a2f5aebb1d 100644 --- a/includes/debug/logger/LegacyLogger.php +++ b/includes/debug/logger/LegacyLogger.php @@ -22,6 +22,7 @@ namespace MediaWiki\Logger; use DateTimeZone; use Error; +use MediaWiki\WikiMap\WikiMap; use MWDebug; use MWExceptionHandler; use Psr\Log\AbstractLogger; @@ -29,7 +30,6 @@ use Psr\Log\LogLevel; use RuntimeException; use Throwable; use UDPTransport; -use WikiMap; use Wikimedia\AtEase\AtEase; /** diff --git a/includes/debug/logger/monolog/WikiProcessor.php b/includes/debug/logger/monolog/WikiProcessor.php index 3ec7a0b85384..3dad04baf7d4 100644 --- a/includes/debug/logger/monolog/WikiProcessor.php +++ b/includes/debug/logger/monolog/WikiProcessor.php @@ -20,7 +20,7 @@ namespace MediaWiki\Logger\Monolog; -use WikiMap; +use MediaWiki\WikiMap\WikiMap; /** * Annotate log records with request-global metadata, such as the hostname, diff --git a/includes/externalstore/ExternalStoreMwstore.php b/includes/externalstore/ExternalStoreMwstore.php index f0a15bf87d6a..d9b5f36aaf64 100644 --- a/includes/externalstore/ExternalStoreMwstore.php +++ b/includes/externalstore/ExternalStoreMwstore.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\WikiMap\WikiMap; + /** * External storage in a FileBackend. * diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 8119771f6a02..bb6090515b8e 100644 --- a/includes/filerepo/LocalRepo.php +++ b/includes/filerepo/LocalRepo.php @@ -23,6 +23,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\Storage\BlobStore; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IResultWrapper; diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php index db5fcb6d97fd..e60e31cfbbaa 100644 --- a/includes/interwiki/ClassicInterwikiLookup.php +++ b/includes/interwiki/ClassicInterwikiLookup.php @@ -27,8 +27,8 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; +use MediaWiki\WikiMap\WikiMap; use WANObjectCache; -use WikiMap; use Wikimedia\Rdbms\ILoadBalancer; /** diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php index 322dd16cf638..4e75129d8309 100644 --- a/includes/jobqueue/JobQueue.php +++ b/includes/jobqueue/JobQueue.php @@ -23,6 +23,7 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface; use MediaWiki\JobQueue\JobFactory; use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\RequestTimeout\TimeoutException; use Wikimedia\UUID\GlobalIdGenerator; diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php index af7e0dde6e1f..ab372c0b9a14 100644 --- a/includes/jobqueue/JobQueueGroup.php +++ b/includes/jobqueue/JobQueueGroup.php @@ -21,6 +21,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\UUID\GlobalIdGenerator; /** diff --git a/includes/jobqueue/JobQueueGroupFactory.php b/includes/jobqueue/JobQueueGroupFactory.php index 470e8b1a7632..7ef6e0cf54e4 100644 --- a/includes/jobqueue/JobQueueGroupFactory.php +++ b/includes/jobqueue/JobQueueGroupFactory.php @@ -25,8 +25,8 @@ use IBufferingStatsdDataFactory; use JobQueueGroup; use MediaWiki\Config\ServiceOptions; use MediaWiki\MainConfigNames; +use MediaWiki\WikiMap\WikiMap; use WANObjectCache; -use WikiMap; use Wikimedia\UUID\GlobalIdGenerator; /** diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php index 2ba555a5116a..46c4d03680a2 100644 --- a/includes/jobqueue/JobQueueRedis.php +++ b/includes/jobqueue/JobQueueRedis.php @@ -21,6 +21,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use MediaWiki\WikiMap\WikiMap; use Psr\Log\LoggerInterface; /** diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php index 927d24ced31c..eeed5493afd8 100644 --- a/includes/logging/RightsLogFormatter.php +++ b/includes/logging/RightsLogFormatter.php @@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; /** * This class formats rights log entries. diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index 701129b1b7af..c6f34ff72b88 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -27,6 +27,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; /** * Collection of static functions for sending mail diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 288293ea9aed..177235ec6154 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -24,6 +24,7 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; /** * Functions to get cache objects diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 10ec8e775755..6f41807a9f36 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -50,6 +50,7 @@ use MediaWiki\Title\TitleArray; use MediaWiki\User\ActorMigration; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\Assert\Assert; use Wikimedia\Assert\PreconditionException; use Wikimedia\NonSerializable\NonSerializableTrait; diff --git a/includes/parser/Parsoid/Config/SiteConfig.php b/includes/parser/Parsoid/Config/SiteConfig.php index 742c81df2b24..587eb31fde65 100644 --- a/includes/parser/Parsoid/Config/SiteConfig.php +++ b/includes/parser/Parsoid/Config/SiteConfig.php @@ -39,6 +39,7 @@ use MediaWiki\Parser\MagicWordFactory; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\User\UserOptionsLookup; use MediaWiki\Utils\UrlUtils; +use MediaWiki\WikiMap\WikiMap; use MutableConfig; use MWException; use NamespaceInfo; @@ -48,7 +49,6 @@ use PrefixingStatsdDataFactoryProxy; use Psr\Log\LoggerInterface; use Title; use UnexpectedValueException; -use WikiMap; use Wikimedia\ObjectFactory\ObjectFactory; use Wikimedia\Parsoid\Config\SiteConfig as ISiteConfig; use Wikimedia\Parsoid\Core\ContentMetadataCollector; diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php index d6e780075790..9958720406e1 100644 --- a/includes/profiler/Profiler.php +++ b/includes/profiler/Profiler.php @@ -19,6 +19,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use MediaWiki\WikiMap\WikiMap; use Psr\Log\LoggerInterface; use Wikimedia\Rdbms\TransactionProfiler; use Wikimedia\ScopedCallback; diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php b/includes/rcfeed/MachineReadableRCFeedFormatter.php index 588149e0b34d..5652931a3bdb 100644 --- a/includes/rcfeed/MachineReadableRCFeedFormatter.php +++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php @@ -21,6 +21,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\WikiMap\WikiMap; /** * Abstract class so there can be multiple formatters outputting the same data diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 0e6fdc367505..d8264c96ee5b 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -36,6 +36,7 @@ use MediaWiki\Skin\SkinComponentRegistry; use MediaWiki\Skin\SkinComponentRegistryContext; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\WrappedStringList; /** diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index a937bf60b011..871e1511dd6f 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -32,6 +32,7 @@ use MediaWiki\User\UserGroupManagerFactory; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNamePrefixSearch; use MediaWiki\User\UserNameUtils; +use MediaWiki\WikiMap\WikiMap; /** * Special page to allow managing user group membership diff --git a/includes/user/CentralId/LocalIdLookup.php b/includes/user/CentralId/LocalIdLookup.php index ea15b4ce05d6..f1eeb2d6775d 100644 --- a/includes/user/CentralId/LocalIdLookup.php +++ b/includes/user/CentralId/LocalIdLookup.php @@ -22,6 +22,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\User\UserIdentity; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\Rdbms\ILoadBalancer; /** diff --git a/includes/user/UserGroupManager.php b/includes/user/UserGroupManager.php index 04281c72fa10..587417f9befd 100644 --- a/includes/user/UserGroupManager.php +++ b/includes/user/UserGroupManager.php @@ -34,13 +34,13 @@ use MediaWiki\MainConfigNames; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\GroupPermissionsLookup; use MediaWiki\User\TempUser\TempUserConfig; +use MediaWiki\WikiMap\WikiMap; use Psr\Log\LoggerInterface; use ReadOnlyMode; use Sanitizer; use User; use UserGroupExpiryJob; use UserGroupMembership; -use WikiMap; use Wikimedia\Assert\Assert; use Wikimedia\IPUtils; use Wikimedia\Rdbms\DBConnRef; diff --git a/includes/user/UserRightsProxy.php b/includes/user/UserRightsProxy.php index 1572fcd3d0c8..efb6ad598fc0 100644 --- a/includes/user/UserRightsProxy.php +++ b/includes/user/UserRightsProxy.php @@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserIdentity; +use MediaWiki\WikiMap\WikiMap; use Wikimedia\Rdbms\IDatabase; /** |