diff options
Diffstat (limited to 'includes/api')
47 files changed, 212 insertions, 134 deletions
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 1730890e31ce..b869947c6d4f 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -25,6 +25,7 @@ use MediaWiki\Api\Validator\SubmoduleDef; use MediaWiki\Block\Block; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Linker\LinkTarget; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\ParamValidator\TypeDef\NamespaceDef; @@ -988,7 +989,8 @@ abstract class ApiBase extends ContextSource { */ public function requirePostedParameters( $params, $prefix = 'prefix' ) { // Skip if $wgDebugAPI is set or we're in internal mode - if ( $this->getConfig()->get( 'DebugAPI' ) || $this->getMain()->isInternalMode() ) { + if ( $this->getConfig()->get( MainConfigNames::DebugAPI ) || + $this->getMain()->isInternalMode() ) { return; } @@ -1616,7 +1618,7 @@ abstract class ApiBase extends ContextSource { * @throws ApiUsageException */ public function dieWithErrorOrDebug( $msg, $code = null, $data = null, $httpCode = null ) { - if ( $this->getConfig()->get( 'DebugAPI' ) !== true ) { + if ( $this->getConfig()->get( MainConfigNames::DebugAPI ) !== true ) { $this->dieWithError( $msg, $code, $data, $httpCode ); } else { $this->addWarning( $msg, $code, $data ); @@ -2002,8 +2004,8 @@ abstract class ApiBase extends ContextSource { // Build map of extension directories to extension info if ( self::$extensionInfo === null ) { - $extDir = $this->getConfig()->get( 'ExtensionDirectory' ); - $baseDir = $this->getConfig()->get( 'BaseDirectory' ); + $extDir = $this->getConfig()->get( MainConfigNames::ExtensionDirectory ); + $baseDir = $this->getConfig()->get( MainConfigNames::BaseDirectory ); self::$extensionInfo = [ realpath( __DIR__ ) ?: __DIR__ => [ 'path' => $baseDir, diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php index db1c540c5fa0..9be695ac45c0 100644 --- a/includes/api/ApiBlock.php +++ b/includes/api/ApiBlock.php @@ -29,6 +29,7 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\ActionRestriction; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\TitleDef; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\User\UserIdentity; @@ -106,8 +107,9 @@ class ApiBlock extends ApiBase { $this->blockActionInfo = $blockActionInfo; // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } @@ -158,7 +160,7 @@ class ApiBlock extends ApiBase { }, (array)$params['namespacerestrictions'] ); $restrictions = array_merge( $pageRestrictions, $namespaceRestrictions ); - if ( $this->getConfig()->get( 'EnablePartialActionBlocks' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnablePartialActionBlocks ) ) { $actionRestrictions = array_map( function ( $action ) { return new ActionRestriction( 0, $this->blockActionInfo->getIdFromAction( $action ) ); }, (array)$params['actionrestrictions'] ); @@ -230,7 +232,7 @@ class ApiBlock extends ApiBase { $res['partial'] = $params['partial']; $res['pagerestrictions'] = $params['pagerestrictions']; $res['namespacerestrictions'] = $params['namespacerestrictions']; - if ( $this->getConfig()->get( 'EnablePartialActionBlocks' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnablePartialActionBlocks ) ) { $res['actionrestrictions'] = $params['actionrestrictions']; } @@ -306,7 +308,7 @@ class ApiBlock extends ApiBase { ], ]; - if ( $this->getConfig()->get( 'EnablePartialActionBlocks' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnablePartialActionBlocks ) ) { $params += [ 'actionrestrictions' => [ ApiBase::PARAM_ISMULTI => true, diff --git a/includes/api/ApiCSPReport.php b/includes/api/ApiCSPReport.php index 51adf80b8388..f6977755e93e 100644 --- a/includes/api/ApiCSPReport.php +++ b/includes/api/ApiCSPReport.php @@ -21,6 +21,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MainConfigNames; use Psr\Log\LoggerInterface; /** @@ -89,7 +90,7 @@ class ApiCSPReport extends ApiBase { private function getFlags( $report, $userAgent ) { $reportOnly = $this->getParameter( 'reportonly' ); $source = $this->getParameter( 'source' ); - $falsePositives = $this->getConfig()->get( 'CSPFalsePositiveUrls' ); + $falsePositives = $this->getConfig()->get( MainConfigNames::CSPFalsePositiveUrls ); $flags = []; if ( $source !== 'internal' ) { diff --git a/includes/api/ApiChangeAuthenticationData.php b/includes/api/ApiChangeAuthenticationData.php index c507e7497256..b852536813fc 100644 --- a/includes/api/ApiChangeAuthenticationData.php +++ b/includes/api/ApiChangeAuthenticationData.php @@ -21,6 +21,7 @@ */ use MediaWiki\Auth\AuthManager; +use MediaWiki\MainConfigNames; /** * Change authentication data with AuthManager @@ -58,7 +59,7 @@ class ApiChangeAuthenticationData extends ApiBase { // Fetch the request $reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests( $helper->loadAuthenticationRequests( AuthManager::ACTION_CHANGE ), - $this->getConfig()->get( 'ChangeCredentialsBlacklist' ) + $this->getConfig()->get( MainConfigNames::ChangeCredentialsBlacklist ) ); if ( count( $reqs ) !== 1 ) { $this->dieWithError( 'apierror-changeauth-norequest', 'badrequest' ); diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index d9b2572cb726..050f002732a8 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Page\DeletePage; use MediaWiki\Page\DeletePageFactory; use MediaWiki\User\UserOptionsLookup; @@ -62,8 +63,9 @@ class ApiDelete extends ApiBase { $this->deletePageFactory = $deletePageFactory; // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 12745be295b8..611fb8af70a4 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -21,6 +21,7 @@ */ use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\RedirectLookup; use MediaWiki\Page\WikiPageFactory; @@ -106,8 +107,9 @@ class ApiEditPage extends ApiBase { $this->wikiPageFactory = $wikiPageFactory ?? $services->getWikiPageFactory(); // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager ?? $services->getWatchlistManager(); $this->userOptionsLookup = $userOptionsLookup ?? $services->getUserOptionsLookup(); $this->redirectLookup = $redirectLookup ?? $services->getRedirectLookup(); @@ -593,7 +595,8 @@ class ApiEditPage extends ApiBase { break; case EditPage::AS_CONTENT_TOO_BIG: case EditPage::AS_MAX_ARTICLE_SIZE_EXCEEDED: - $status->fatal( 'apierror-contenttoobig', $this->getConfig()->get( 'MaxArticleSize' ) ); + $status->fatal( 'apierror-contenttoobig', + $this->getConfig()->get( MainConfigNames::MaxArticleSize ) ); break; case EditPage::AS_READ_ONLY_PAGE_ANON: $status->fatal( 'apierror-noedit-anon' ); diff --git a/includes/api/ApiFeedRecentChanges.php b/includes/api/ApiFeedRecentChanges.php index fb1713fd0526..3104e083b4a4 100644 --- a/includes/api/ApiFeedRecentChanges.php +++ b/includes/api/ApiFeedRecentChanges.php @@ -19,6 +19,7 @@ * @since 1.23 */ +use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPageFactory; /** @@ -65,11 +66,11 @@ class ApiFeedRecentChanges extends ApiBase { $this->params = $this->extractRequestParams(); - if ( !$config->get( 'Feed' ) ) { + if ( !$config->get( MainConfigNames::Feed ) ) { $this->dieWithError( 'feed-unavailable' ); } - $feedClasses = $config->get( 'FeedClasses' ); + $feedClasses = $config->get( MainConfigNames::FeedClasses ); if ( !isset( $feedClasses[$this->params['feedformat']] ) ) { $this->dieWithError( 'feed-invalid' ); } @@ -145,7 +146,7 @@ class ApiFeedRecentChanges extends ApiBase { public function getAllowedParams() { $config = $this->getConfig(); - $feedFormatNames = array_keys( $config->get( 'FeedClasses' ) ); + $feedFormatNames = array_keys( $config->get( MainConfigNames::FeedClasses ) ); $ret = [ 'feedformat' => [ @@ -167,7 +168,7 @@ class ApiFeedRecentChanges extends ApiBase { 'limit' => [ ApiBase::PARAM_DFLT => 50, ApiBase::PARAM_MIN => 1, - ApiBase::PARAM_MAX => $config->get( 'FeedLimit' ), + ApiBase::PARAM_MAX => $config->get( MainConfigNames::FeedLimit ), ApiBase::PARAM_TYPE => 'integer', ], 'from' => [ diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index c6611b7b1398..6661cfe30d37 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; /** @@ -204,7 +205,7 @@ abstract class ApiFormatBase extends ApiBase { $this->getMain()->getRequest()->response()->header( "Content-Type: $mime; charset=utf-8" ); // Set X-Frame-Options API results (T41180) - $apiFrameOptions = $this->getConfig()->get( 'ApiFrameOptions' ); + $apiFrameOptions = $this->getConfig()->get( MainConfigNames::ApiFrameOptions ); if ( $apiFrameOptions ) { $this->getMain()->getRequest()->response()->header( "X-Frame-Options: $apiFrameOptions" ); } diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php index bd3bafca57a0..2656e56f983c 100644 --- a/includes/api/ApiFormatPhp.php +++ b/includes/api/ApiFormatPhp.php @@ -20,6 +20,8 @@ * @file */ +use MediaWiki\MainConfigNames; + /** * API Serialized PHP output formatter * @ingroup API @@ -60,7 +62,7 @@ class ApiFormatPhp extends ApiFormatBase { // Flash, but what it does isn't friendly for the API. There's nothing // we can do here that isn't actively broken in some manner, so let's // just be broken in a useful manner. - if ( $this->getConfig()->get( 'MangleFlashPolicy' ) && + if ( $this->getConfig()->get( MainConfigNames::MangleFlashPolicy ) && in_array( 'MediaWiki\\OutputHandler::handle', ob_list_handlers(), true ) && preg_match( '/\<\s*cross-domain-policy(?=\s|\>)/i', $text ) ) { diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index c884013ef528..e573cb3dde6a 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -22,6 +22,7 @@ use HtmlFormatter\HtmlFormatter; use MediaWiki\ExtensionInfo; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use Wikimedia\ParamValidator\ParamValidator; @@ -146,7 +147,7 @@ class ApiHelp extends ApiBase { $options['recursivesubmodules'] && $context->getLanguage()->equals( $services->getContentLanguage() ) ) { - $cacheHelpTimeout = $context->getConfig()->get( 'APICacheHelpTimeout' ); + $cacheHelpTimeout = $context->getConfig()->get( MainConfigNames::APICacheHelpTimeout ); if ( $cacheHelpTimeout > 0 ) { // Get help text from cache if present $cacheKey = $cache->makeKey( 'apihelp', $modules[0]->getModulePath(), diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index a5fa92bf1476..64178f6d4707 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -20,6 +20,8 @@ * @file */ +use MediaWiki\MainConfigNames; + /** * API module that imports an XML file like Special:Import does * @@ -131,7 +133,7 @@ class ApiImport extends ApiBase { * @since 1.27 */ public function getAllowedImportSources() { - $importSources = $this->getConfig()->get( 'ImportSources' ); + $importSources = $this->getConfig()->get( MainConfigNames::ImportSources ); $this->getHookRunner()->onImportSources( $importSources ); $result = []; diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index 4306817ebba7..0ff2f5fccba2 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -25,6 +25,7 @@ use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\AuthManager; use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MainConfigNames; /** * Unit to authenticate log-in attempts to the current wiki. @@ -51,7 +52,7 @@ class ApiLogin extends ApiBase { } protected function getExtendedDescription() { - if ( $this->getConfig()->get( 'EnableBotPasswords' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnableBotPasswords ) ) { return 'apihelp-login-extended-description'; } else { return 'apihelp-login-extended-description-nobotpasswords'; @@ -135,7 +136,7 @@ class ApiLogin extends ApiBase { // Try bot passwords if ( - $authRes === false && $this->getConfig()->get( 'EnableBotPasswords' ) && + $authRes === false && $this->getConfig()->get( MainConfigNames::EnableBotPasswords ) && ( $botLoginData = BotPassword::canonicalizeLoginData( $params['name'], $params['password'] ) ) ) { $status = BotPassword::login( @@ -176,7 +177,7 @@ class ApiLogin extends ApiBase { $res = $this->authManager->beginAuthentication( $reqs, 'null:' ); switch ( $res->status ) { case AuthenticationResponse::PASS: - if ( $this->getConfig()->get( 'EnableBotPasswords' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnableBotPasswords ) ) { $this->addDeprecation( 'apiwarn-deprecation-login-botpw', 'main-account-login' ); } else { $this->addDeprecation( 'apiwarn-deprecation-login-nobotpw', 'main-account-login' ); @@ -232,7 +233,7 @@ class ApiLogin extends ApiBase { case 'Aborted': $result['reason'] = $this->formatMessage( - $this->getConfig()->get( 'EnableBotPasswords' ) + $this->getConfig()->get( MainConfigNames::EnableBotPasswords ) ? 'api-login-fail-aborted' : 'api-login-fail-aborted-nobotpw' ); @@ -256,7 +257,7 @@ class ApiLogin extends ApiBase { } public function isDeprecated() { - return !$this->getConfig()->get( 'EnableBotPasswords' ); + return !$this->getConfig()->get( MainConfigNames::EnableBotPasswords ); } public function mustBePosted() { diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 82904a154036..f7cb278c3afe 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -23,6 +23,7 @@ use MediaWiki\Api\Validator\ApiParamValidator; use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Rest\HeaderParser\Origin; @@ -560,7 +561,8 @@ class ApiMain extends ApiBase { $services->getObjectFactory() ); - $this->mResult = new ApiResult( $this->getConfig()->get( 'APIMaxResultSize' ) ); + $this->mResult = + new ApiResult( $this->getConfig()->get( MainConfigNames::APIMaxResultSize ) ); // Setup uselang. This doesn't use $this->getParameter() // because we're not ready to handle errors yet. @@ -614,9 +616,9 @@ class ApiMain extends ApiBase { $services->getObjectFactory() ); $this->mModuleMgr->addModules( self::MODULES, 'action' ); - $this->mModuleMgr->addModules( $config->get( 'APIModules' ), 'action' ); + $this->mModuleMgr->addModules( $config->get( MainConfigNames::APIModules ), 'action' ); $this->mModuleMgr->addModules( self::FORMATS, 'format' ); - $this->mModuleMgr->addModules( $config->get( 'APIFormatModules' ), 'format' ); + $this->mModuleMgr->addModules( $config->get( MainConfigNames::APIFormatModules ), 'format' ); $this->getHookRunner()->onApiMain__moduleManager( $this->mModuleMgr ); @@ -1068,8 +1070,8 @@ class ApiMain extends ApiBase { $config = $this->getConfig(); $origin = Origin::parseHeaderList( $origins ); $matchedOrigin = $origin->match( - $config->get( 'CrossSiteAJAXdomains' ), - $config->get( 'CrossSiteAJAXdomainExceptions' ) + $config->get( MainConfigNames::CrossSiteAJAXdomains ), + $config->get( MainConfigNames::CrossSiteAJAXdomainExceptions ) ); $allowOrigin = $originHeader; @@ -1083,7 +1085,7 @@ class ApiMain extends ApiBase { if ( $preflight ) { // We allow the actual request to send the following headers $requestedHeaders = $request->getHeader( 'Access-Control-Request-Headers' ); - $allowedHeaders = $this->getConfig()->get( 'AllowedCorsHeaders' ); + $allowedHeaders = $this->getConfig()->get( MainConfigNames::AllowedCorsHeaders ); if ( $requestedHeaders !== false ) { if ( !self::matchRequestedHeaders( $requestedHeaders, $allowedHeaders ) ) { $response->header( 'MediaWiki-CORS-Rejection: Unsupported header requested in preflight' ); @@ -1162,7 +1164,7 @@ class ApiMain extends ApiBase { $config = $this->getConfig(); - if ( $config->get( 'VaryOnXFP' ) ) { + if ( $config->get( MainConfigNames::VaryOnXFP ) ) { $out->addVaryHeader( 'X-Forwarded-Proto' ); } @@ -1307,7 +1309,7 @@ class ApiMain extends ApiBase { $class = preg_replace( '#^Wikimedia\\\Rdbms\\\#', '', get_class( $e ) ); $code = 'internal_api_error_' . $class; $data = [ 'errorclass' => get_class( $e ) ]; - if ( $config->get( 'ShowExceptionDetails' ) ) { + if ( $config->get( MainConfigNames::ShowExceptionDetails ) ) { if ( $e instanceof ILocalizedException ) { $msg = $e->getMessageObject(); } elseif ( $e instanceof MessageSpecifier ) { @@ -1390,7 +1392,7 @@ class ApiMain extends ApiBase { . $this->msg( 'api-usage-mailinglist-ref' )->inLanguage( $formatter->getLanguage() )->text() ) ); - } elseif ( $config->get( 'ShowExceptionDetails' ) ) { + } elseif ( $config->get( MainConfigNames::ShowExceptionDetails ) ) { $result->addContentValue( $path, 'trace', @@ -1422,7 +1424,7 @@ class ApiMain extends ApiBase { $result->addValue( null, 'requestid', $requestid, ApiResult::NO_SIZE_CHECK ); } - if ( $this->getConfig()->get( 'ShowHostnames' ) && ( + if ( $this->getConfig()->get( MainConfigNames::ShowHostnames ) && ( in_array( 'servedby', $force, true ) || $this->getParameter( 'servedby' ) ) ) { $result->addValue( null, 'servedby', wfHostname(), ApiResult::NO_SIZE_CHECK ); @@ -1525,7 +1527,8 @@ class ApiMain extends ApiBase { 'type' => 'db' ]; - $jobQueueLagFactor = $this->getConfig()->get( 'JobQueueIncludeInMaxLagFactor' ); + $jobQueueLagFactor = + $this->getConfig()->get( MainConfigNames::JobQueueIncludeInMaxLagFactor ); if ( $jobQueueLagFactor ) { // Turn total number of jobs into seconds by using the configured value $totalJobs = array_sum( $services->getJobQueueGroup()->getQueueSizes() ); @@ -1561,7 +1564,7 @@ class ApiMain extends ApiBase { $response->header( 'Retry-After: ' . max( (int)$maxLag, 5 ) ); $response->header( 'X-Database-Lag: ' . (int)$lagInfo['lag'] ); - if ( $this->getConfig()->get( 'ShowHostnames' ) ) { + if ( $this->getConfig()->get( MainConfigNames::ShowHostnames ) ) { $this->dieWithError( [ 'apierror-maxlag', $lagInfo['lag'], $lagInfo['host'] ], 'maxlag', @@ -1660,13 +1663,13 @@ class ApiMain extends ApiBase { $modifiedTimes = [ 'page' => $lastMod, 'user' => $this->getUser()->getTouched(), - 'epoch' => $config->get( 'CacheEpoch' ), + 'epoch' => $config->get( MainConfigNames::CacheEpoch ), ]; - if ( $config->get( 'UseCdn' ) ) { + if ( $config->get( MainConfigNames::UseCdn ) ) { // T46570: the core page itself may not change, but resources might $modifiedTimes['sepoch'] = wfTimestamp( - TS_MW, time() - $config->get( 'CdnMaxAge' ) + TS_MW, time() - $config->get( MainConfigNames::CdnMaxAge ) ); } $this->getHookRunner()->onOutputPageCheckLastModified( $modifiedTimes, $this->getOutput() ); @@ -1751,7 +1754,7 @@ class ApiMain extends ApiBase { private function checkBotReadOnly() { // Figure out how many servers have passed the lag threshold $numLagged = 0; - $lagLimit = $this->getConfig()->get( 'APIMaxLagThreshold' ); + $lagLimit = $this->getConfig()->get( MainConfigNames::APIMaxLagThreshold ); $laggedServers = []; $loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer(); foreach ( $loadBalancer->getLagTimes() as $serverIndex => $lag ) { @@ -1854,7 +1857,7 @@ class ApiMain extends ApiBase { if ( $request->getProtocol() === 'http' && ( - $this->getConfig()->get( 'ForceHTTPS' ) || + $this->getConfig()->get( MainConfigNames::ForceHTTPS ) || $request->getSession()->shouldForceHTTPS() || ( $this->getUser()->isRegistered() && $this->getUser()->requiresHTTPS() ) @@ -1912,7 +1915,7 @@ class ApiMain extends ApiBase { * @param ApiBase $module */ protected function setRequestExpectations( ApiBase $module ) { - $limits = $this->getConfig()->get( 'TrxProfilerLimits' ); + $limits = $this->getConfig()->get( MainConfigNames::TrxProfilerLimits ); $trxProfiler = Profiler::instance()->getTransactionProfiler(); $trxProfiler->setLogger( LoggerFactory::getInstance( 'DBPerformance' ) ); if ( $this->getRequest()->hasSafeMethod() ) { @@ -1948,7 +1951,7 @@ class ApiMain extends ApiBase { 'id' => MediaWikiServices::getInstance() ->getGlobalIdGenerator()->newUUIDv4(), 'dt' => wfTimestamp( TS_ISO_8601 ), - 'domain' => $this->getConfig()->get( 'ServerName' ), + 'domain' => $this->getConfig()->get( MainConfigNames::ServerName ), // If using the EventBus extension (as intended) with this log channel, // this stream name will map to a Kafka topic. 'stream' => 'mediawiki.api-request' @@ -2146,7 +2149,7 @@ class ApiMain extends ApiBase { * @param int $httpCode HTTP status code, or 0 to not change */ protected function printResult( $httpCode = 0 ) { - if ( $this->getConfig()->get( 'DebugAPI' ) !== false ) { + if ( $this->getConfig()->get( MainConfigNames::DebugAPI ) !== false ) { $this->addWarning( 'apiwarn-wgdebugapi' ); } diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php index c03bbf213d9c..0c9612e1bdc1 100644 --- a/includes/api/ApiMove.php +++ b/includes/api/ApiMove.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Page\MovePageFactory; use MediaWiki\User\UserOptionsLookup; use MediaWiki\Watchlist\WatchlistManager; @@ -52,8 +53,9 @@ class ApiMove extends ApiBase { $this->repoGroup = $repoGroup; // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php index a02eb2cf8a01..384e67f4f096 100644 --- a/includes/api/ApiOpenSearch.php +++ b/includes/api/ApiOpenSearch.php @@ -23,6 +23,7 @@ */ use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; /** @@ -111,7 +112,8 @@ class ApiOpenSearch extends ApiBase { $search = $params['search']; // Open search results may be stored for a very long time - $this->getMain()->setCacheMaxAge( $this->getConfig()->get( 'SearchSuggestCacheExpiry' ) ); + $this->getMain()->setCacheMaxAge( + $this->getConfig()->get( MainConfigNames::SearchSuggestCacheExpiry ) ); $this->getMain()->setCacheMode( 'public' ); $results = $this->search( $search, $params ); @@ -119,7 +121,7 @@ class ApiOpenSearch extends ApiBase { $this->getHookRunner()->onApiOpenSearchSuggest( $results ); // Trim extracts, if necessary - $length = $this->getConfig()->get( 'OpenSearchDescriptionLength' ); + $length = $this->getConfig()->get( MainConfigNames::OpenSearchDescriptionLength ); foreach ( $results as &$r ) { if ( is_string( $r['extract'] ) && !$r['extract trimmed'] ) { $r['extract'] = self::trimExtract( $r['extract'], $length ); @@ -384,7 +386,7 @@ class ApiOpenSearch extends ApiBase { */ public static function getOpenSearchTemplate( $type ) { $config = MediaWikiServices::getInstance()->getSearchEngineConfig(); - $template = $config->getConfig()->get( 'OpenSearchTemplate' ); + $template = $config->getConfig()->get( MainConfigNames::OpenSearchTemplate ); if ( $template && $type === 'application/x-suggestions+json' ) { return $template; @@ -397,12 +399,13 @@ class ApiOpenSearch extends ApiBase { switch ( $type ) { case 'application/x-suggestions+json': - return $config->getConfig()->get( 'CanonicalServer' ) . wfScript( 'api' ) - . '?action=opensearch&search={searchTerms}&namespace=' . $ns; + return $config->getConfig()->get( MainConfigNames::CanonicalServer ) . + wfScript( 'api' ) . '?action=opensearch&search={searchTerms}&namespace=' . $ns; case 'application/x-suggestions+xml': - return $config->getConfig()->get( 'CanonicalServer' ) . wfScript( 'api' ) - . '?action=opensearch&format=xml&search={searchTerms}&namespace=' . $ns; + return $config->getConfig()->get( MainConfigNames::CanonicalServer ) . + wfScript( 'api' ) . + '?action=opensearch&format=xml&search={searchTerms}&namespace=' . $ns; default: throw new MWException( __METHOD__ . ": Unknown type '$type'" ); diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index d6f2d575b664..9e08b33638cf 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -22,6 +22,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Linker\LinkTarget; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageReference; @@ -430,7 +431,7 @@ class ApiPageSet extends ApiBase { $pageFlds['page_content_model'] = null; - if ( $this->getConfig()->get( 'PageLanguageUseDB' ) ) { + if ( $this->getConfig()->get( MainConfigNames::PageLanguageUseDB ) ) { $pageFlds['page_lang'] = null; } diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php index 358c8fc253ed..5d02fb812c1d 100644 --- a/includes/api/ApiProtect.php +++ b/includes/api/ApiProtect.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\User\UserOptionsLookup; use MediaWiki\Watchlist\WatchlistManager; @@ -45,8 +46,9 @@ class ApiProtect extends ApiBase { parent::__construct( $mainModule, $moduleName ); // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index 9e2831dce348..09e88e269cac 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -21,6 +21,7 @@ */ use MediaWiki\Export\WikiExporterFactory; +use MediaWiki\MainConfigNames; use Wikimedia\ObjectFactory\ObjectFactory; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\ILoadBalancer; @@ -515,11 +516,11 @@ class ApiQuery extends ApiBase { // Allow custom modules to be added in LocalSettings.php $config = $this->getConfig(); $this->mModuleMgr->addModules( self::QUERY_PROP_MODULES, 'prop' ); - $this->mModuleMgr->addModules( $config->get( 'APIPropModules' ), 'prop' ); + $this->mModuleMgr->addModules( $config->get( MainConfigNames::APIPropModules ), 'prop' ); $this->mModuleMgr->addModules( self::QUERY_LIST_MODULES, 'list' ); - $this->mModuleMgr->addModules( $config->get( 'APIListModules' ), 'list' ); + $this->mModuleMgr->addModules( $config->get( MainConfigNames::APIListModules ), 'list' ); $this->mModuleMgr->addModules( self::QUERY_META_MODULES, 'meta' ); - $this->mModuleMgr->addModules( $config->get( 'APIMetaModules' ), 'meta' ); + $this->mModuleMgr->addModules( $config->get( MainConfigNames::APIMetaModules ), 'meta' ); $this->getHookRunner()->onApiQuery__moduleManager( $this->mModuleMgr ); diff --git a/includes/api/ApiQueryAllDeletedRevisions.php b/includes/api/ApiQueryAllDeletedRevisions.php index 4aa5f82484ce..23b63fb49f7b 100644 --- a/includes/api/ApiQueryAllDeletedRevisions.php +++ b/includes/api/ApiQueryAllDeletedRevisions.php @@ -26,6 +26,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -264,7 +265,7 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase { } } } else { - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $miser_ns = $params['namespace']; } else { $this->addWhereFld( 'ar_namespace', $params['namespace'] ); @@ -491,7 +492,7 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase { ], ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['user'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'apihelp-query+alldeletedrevisions-param-miser-user-namespace', ]; diff --git a/includes/api/ApiQueryAllImages.php b/includes/api/ApiQueryAllImages.php index cf3cd1c52875..a47780a80474 100644 --- a/includes/api/ApiQueryAllImages.php +++ b/includes/api/ApiQueryAllImages.php @@ -24,6 +24,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Permissions\GroupPermissionsLookup; use Wikimedia\Rdbms\IDatabase; @@ -256,7 +257,7 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase { } if ( $params['mime'] !== null ) { - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $this->dieWithError( 'apierror-mimesearchdisabled' ); } @@ -409,7 +410,7 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase { ], ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['mime'][ApiBase::PARAM_HELP_MSG] = 'api-help-param-disabled-in-miser-mode'; } diff --git a/includes/api/ApiQueryAllPages.php b/includes/api/ApiQueryAllPages.php index e502382438e1..a34a25e8f3bc 100644 --- a/includes/api/ApiQueryAllPages.php +++ b/includes/api/ApiQueryAllPages.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Permissions\RestrictionStore; /** @@ -98,7 +99,7 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase { $this->addWhere( "page_title $op= $cont_from" ); } - $miserMode = $this->getConfig()->get( 'MiserMode' ); + $miserMode = $this->getConfig()->get( MainConfigNames::MiserMode ); if ( !$miserMode ) { if ( $params['filterredir'] == 'redirects' ) { $this->addWhereFld( 'page_is_redirect', 1 ); @@ -314,7 +315,8 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase { ApiBase::PARAM_ISMULTI => true ], 'prlevel' => [ - ApiBase::PARAM_TYPE => $this->getConfig()->get( 'RestrictionLevels' ), + ApiBase::PARAM_TYPE => + $this->getConfig()->get( MainConfigNames::RestrictionLevels ), ApiBase::PARAM_ISMULTI => true ], 'prfiltercascade' => [ @@ -357,7 +359,7 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase { ], ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['filterredir'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode' ]; } diff --git a/includes/api/ApiQueryAllRevisions.php b/includes/api/ApiQueryAllRevisions.php index 4c47235adc29..1aee5e5f7a3e 100644 --- a/includes/api/ApiQueryAllRevisions.php +++ b/includes/api/ApiQueryAllRevisions.php @@ -23,6 +23,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -101,7 +102,8 @@ class ApiQueryAllRevisions extends ApiQueryRevisionsBase { $idField = 'rev_id'; $pageField = 'rev_page'; if ( $params['user'] !== null && - ( $this->getConfig()->get( 'ActorTableSchemaMigrationStage' ) & SCHEMA_COMPAT_READ_TEMP ) + ( $this->getConfig()->get( MainConfigNames::ActorTableSchemaMigrationStage ) & + SCHEMA_COMPAT_READ_TEMP ) ) { // The query is probably best done using the actor_timestamp index on // revision_actor_temp. Use the denormalized fields from that table. @@ -119,7 +121,7 @@ class ApiQueryAllRevisions extends ApiQueryRevisionsBase { sort( $params['namespace'] ); if ( $params['namespace'] != $this->namespaceInfo->getValidNamespaces() ) { $needPageTable = true; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $miser_ns = $params['namespace']; } else { $this->addWhere( [ 'page_namespace' => $params['namespace'] ] ); @@ -348,7 +350,7 @@ class ApiQueryAllRevisions extends ApiQueryRevisionsBase { ], ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['namespace'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode', ]; diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index 1755d505bef9..de939849afd9 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -21,6 +21,7 @@ */ use MediaWiki\Block\DatabaseBlock; +use MediaWiki\MainConfigNames; use MediaWiki\Permissions\GroupPermissionsLookup; use MediaWiki\User\UserFactory; use MediaWiki\User\UserGroupManager; @@ -81,7 +82,7 @@ class ApiQueryAllUsers extends ApiQueryBase { public function execute() { $params = $this->extractRequestParams(); - $activeUserDays = $this->getConfig()->get( 'ActiveUserDays' ); + $activeUserDays = $this->getConfig()->get( MainConfigNames::ActiveUserDays ); $db = $this->getDB(); @@ -414,7 +415,7 @@ class ApiQueryAllUsers extends ApiQueryBase { ApiBase::PARAM_DFLT => false, ApiBase::PARAM_HELP_MSG => [ 'apihelp-query+allusers-param-activeusers', - $this->getConfig()->get( 'ActiveUserDays' ) + $this->getConfig()->get( MainConfigNames::ActiveUserDays ) ], ], 'attachedwiki' => null, diff --git a/includes/api/ApiQueryAuthManagerInfo.php b/includes/api/ApiQueryAuthManagerInfo.php index 1d100fd9e2b4..3088757d337f 100644 --- a/includes/api/ApiQueryAuthManagerInfo.php +++ b/includes/api/ApiQueryAuthManagerInfo.php @@ -22,6 +22,7 @@ */ use MediaWiki\Auth\AuthManager; +use MediaWiki\MainConfigNames; /** * A query action to return meta information about AuthManager state. @@ -85,13 +86,13 @@ class ApiQueryAuthManagerInfo extends ApiQueryBase { // Filter out blacklisted requests, depending on the action switch ( $action ) { case AuthManager::ACTION_CHANGE: - $reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests( - $reqs, $this->getConfig()->get( 'ChangeCredentialsBlacklist' ) + $reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests( $reqs, + $this->getConfig()->get( MainConfigNames::ChangeCredentialsBlacklist ) ); break; case AuthManager::ACTION_REMOVE: - $reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests( - $reqs, $this->getConfig()->get( 'RemoveCredentialsBlacklist' ) + $reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests( $reqs, + $this->getConfig()->get( MainConfigNames::RemoveCredentialsBlacklist ) ); break; } diff --git a/includes/api/ApiQueryBacklinksprop.php b/includes/api/ApiQueryBacklinksprop.php index c570a86eb2e9..4b0178230180 100644 --- a/includes/api/ApiQueryBacklinksprop.php +++ b/includes/api/ApiQueryBacklinksprop.php @@ -23,6 +23,8 @@ * @since 1.24 */ +use MediaWiki\MainConfigNames; + /** * This implements prop=redirects, prop=linkshere, prop=catmembers, * prop=transcludedin, and prop=fileusage @@ -160,7 +162,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase { $miser_ns = null; if ( $params['namespace'] !== null ) { if ( empty( $settings['from_namespace'] ) ) { - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $miser_ns = $params['namespace']; } else { $this->addWhereFld( 'page_namespace', $params['namespace'] ); @@ -404,7 +406,8 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase { ], ]; - if ( empty( $settings['from_namespace'] ) && $this->getConfig()->get( 'MiserMode' ) ) { + if ( empty( $settings['from_namespace'] ) && + $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['namespace'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode', ]; diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index ed43611f25b5..6b59022b3fa0 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -22,6 +22,7 @@ use MediaWiki\Block\BlockActionInfo; use MediaWiki\Block\BlockRestrictionStore; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use Wikimedia\IPUtils; use Wikimedia\Rdbms\IResultWrapper; @@ -136,7 +137,7 @@ class ApiQueryBlocks extends ApiQueryBase { $this->addWhereFld( 'ipb_auto', 0 ); } if ( $params['ip'] !== null ) { - $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); + $blockCIDRLimit = $this->getConfig()->get( MainConfigNames::BlockCIDRLimit ); if ( IPUtils::isIPv4( $params['ip'] ) ) { $type = 'IPv4'; $cidrLimit = $blockCIDRLimit['IPv4']; @@ -302,7 +303,7 @@ class ApiQueryBlocks extends ApiQueryBase { 'page' => 'pages', 'ns' => 'namespaces', ]; - if ( $this->getConfig()->get( 'EnablePartialActionBlocks' ) ) { + if ( $this->getConfig()->get( MainConfigNames::EnablePartialActionBlocks ) ) { $keys['action'] = 'actions'; } @@ -336,7 +337,7 @@ class ApiQueryBlocks extends ApiQueryBase { } public function getAllowedParams() { - $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); + $blockCIDRLimit = $this->getConfig()->get( MainConfigNames::BlockCIDRLimit ); return [ 'start' => [ diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php index a22ef2ae99de..d40e49309708 100644 --- a/includes/api/ApiQueryCategoryMembers.php +++ b/includes/api/ApiQueryCategoryMembers.php @@ -21,6 +21,7 @@ */ use MediaWiki\Collation\CollationFactory; +use MediaWiki\MainConfigNames; /** * A query module to enumerate pages that belong to a category. @@ -107,7 +108,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { // Scanning large datasets for rare categories sucks, and I already told // how to have efficient subcategory access :-) ~~~~ (oh well, domas) $miser_ns = []; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $miser_ns = $params['namespace'] ?: []; } else { $this->addWhereFld( 'page_namespace', $params['namespace'] ); @@ -389,7 +390,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { ], ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['namespace'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode', ]; diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php index 2e65122c9dc6..8c35cf2cf1fd 100644 --- a/includes/api/ApiQueryContributors.php +++ b/includes/api/ApiQueryContributors.php @@ -23,6 +23,7 @@ * @since 1.23 */ +use MediaWiki\MainConfigNames; use MediaWiki\Permissions\GroupPermissionsLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -113,7 +114,8 @@ class ApiQueryContributors extends ApiQueryBase { // For SCHEMA_COMPAT_READ_TEMP, target indexes on the // revision_actor_temp table, otherwise on the revision table. - if ( $this->getConfig()->get( 'ActorTableSchemaMigrationStage' ) & SCHEMA_COMPAT_READ_TEMP ) { + if ( $this->getConfig()->get( MainConfigNames::ActorTableSchemaMigrationStage ) & + SCHEMA_COMPAT_READ_TEMP ) { $pageField = 'revactor_page'; $idField = 'revactor_actor'; $countField = 'revactor_actor'; diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php index 30bdd2fa54df..9842dae4eb8c 100644 --- a/includes/api/ApiQueryExtLinksUsage.php +++ b/includes/api/ApiQueryExtLinksUsage.php @@ -21,6 +21,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; /** @@ -63,7 +64,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { $this->addJoinConds( [ 'page' => [ 'JOIN', 'page_id=el_from' ] ] ); $miser_ns = []; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $miser_ns = $params['namespace'] ?: []; } else { $this->addWhereFld( 'page_namespace', $params['namespace'] ); @@ -242,7 +243,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { 'expandurl' => false, ]; - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $ret['namespace'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode', ]; @@ -252,7 +253,8 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { } public static function prepareProtocols() { - $urlProtocols = MediaWikiServices::getInstance()->getMainConfig()->get( 'UrlProtocols' ); + $urlProtocols = MediaWikiServices::getInstance()->getMainConfig() + ->get( MainConfigNames::UrlProtocols ); $protocols = [ '' ]; foreach ( $urlProtocols as $p ) { if ( $p !== '//' ) { @@ -265,7 +267,8 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase { public static function getProtocolPrefix( $protocol ) { // Find the right prefix - $urlProtocols = MediaWikiServices::getInstance()->getMainConfig()->get( 'UrlProtocols' ); + $urlProtocols = MediaWikiServices::getInstance()->getMainConfig() + ->get( MainConfigNames::UrlProtocols ); if ( $protocol && !in_array( $protocol, $urlProtocols ) ) { foreach ( $urlProtocols as $p ) { if ( substr( $p, 0, strlen( $protocol ) ) === $protocol ) { diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index 22fb1ebc13a5..27f38e317f96 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -21,6 +21,7 @@ */ use MediaWiki\BadFileLookup; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; /** @@ -327,7 +328,8 @@ class ApiQueryImageInfo extends ApiQueryBase { // don't have a width of their own, so pick something arbitrary so // thumbnailing the default icon works. if ( $image->getWidth() <= 0 ) { - $thumbParams['width'] = max( $this->getConfig()->get( 'ThumbLimits' ) ); + $thumbParams['width'] = + max( $this->getConfig()->get( MainConfigNames::ThumbLimits ) ); } else { $thumbParams['width'] = $image->getWidth(); } diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index 9a35e9bdbdbb..d9aac4335ec1 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -22,6 +22,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\Linker\LinkTarget; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\ParamValidator\TypeDef\TitleDef; use MediaWiki\Permissions\PermissionStatus; @@ -142,7 +143,7 @@ class ApiQueryInfo extends ApiQueryBase { $pageSet->requestField( 'page_latest' ); $pageSet->requestField( 'page_len' ); $pageSet->requestField( 'page_content_model' ); - if ( $config->get( 'PageLanguageUseDB' ) ) { + if ( $config->get( MainConfigNames::PageLanguageUseDB ) ) { $pageSet->requestField( 'page_lang' ); } } @@ -755,7 +756,8 @@ class ApiQueryInfo extends ApiQueryBase { } $canUnwatchedpages = $this->getAuthority()->isAllowed( 'unwatchedpages' ); - $unwatchedPageThreshold = $this->getConfig()->get( 'UnwatchedPageThreshold' ); + $unwatchedPageThreshold = + $this->getConfig()->get( MainConfigNames::UnwatchedPageThreshold ); if ( !$canUnwatchedpages && !is_int( $unwatchedPageThreshold ) ) { return; } @@ -784,7 +786,7 @@ class ApiQueryInfo extends ApiQueryBase { $db = $this->getDB(); $canUnwatchedpages = $this->getAuthority()->isAllowed( 'unwatchedpages' ); - $unwatchedPageThreshold = $config->get( 'UnwatchedPageThreshold' ); + $unwatchedPageThreshold = $config->get( MainConfigNames::UnwatchedPageThreshold ); if ( !$canUnwatchedpages && !is_int( $unwatchedPageThreshold ) ) { return; } @@ -806,7 +808,7 @@ class ApiQueryInfo extends ApiQueryBase { $this->addOption( 'GROUP BY', [ 'page_namespace', 'page_title' ] ); $timestampRes = $this->select( __METHOD__ ); - $age = $config->get( 'WatchersMaxAge' ); + $age = $config->get( MainConfigNames::WatchersMaxAge ); $timestamps = []; foreach ( $timestampRes as $row ) { $revTimestamp = wfTimestamp( TS_UNIX, (int)$row->rev_timestamp ); diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php index c124a844ff21..e4a08a48e631 100644 --- a/includes/api/ApiQueryLangLinks.php +++ b/includes/api/ApiQueryLangLinks.php @@ -21,6 +21,7 @@ */ use MediaWiki\Languages\LanguageNameUtils; +use MediaWiki\MainConfigNames; /** * A query module to list all langlinks (links to corresponding foreign language pages). @@ -130,7 +131,7 @@ class ApiQueryLangLinks extends ApiQueryBase { break; } - $languageNameMap = $this->getConfig()->get( 'InterlanguageLinkCodeMap' ); + $languageNameMap = $this->getConfig()->get( MainConfigNames::InterlanguageLinkCodeMap ); $displayLanguageCode = $languageNameMap[ $row->ll_lang ] ?? $row->ll_lang; // This is potentially risky and confusing (request `no`, but get `nb` in the result). diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index aee10d89aba4..c2087b35e47e 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -22,6 +22,7 @@ use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\CommentFormatter\RowCommentFormatter; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Storage\NameTableAccessException; use MediaWiki\Storage\NameTableStore; @@ -220,7 +221,7 @@ class ApiQueryLogEvents extends ApiQueryBase { $prefix = $params['prefix']; if ( $prefix !== null ) { - if ( $this->getConfig()->get( 'MiserMode' ) ) { + if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) { $this->dieWithError( 'apierror-prefixsearchdisabled' ); } @@ -263,7 +264,7 @@ class ApiQueryLogEvents extends ApiQueryBase { $this->addOption( 'MAX_EXECUTION_TIME', - $this->getConfig()->get( 'MaxExecutionTimeForExpensiveQueries' ) + $this->getConfig()->get( MainConfigNames::MaxExecutionTimeForExpensiveQueries ) ); $count = 0; @@ -405,8 +406,8 @@ class ApiQueryLogEvents extends ApiQueryBase { private function getAllowedLogActions() { $config = $this->getConfig(); return array_keys( array_merge( - $config->get( 'LogActions' ), - $config->get( 'LogActionsHandlers' ) + $config->get( MainConfigNames::LogActions ), + $config->get( MainConfigNames::LogActionsHandlers ) ) ); } @@ -496,7 +497,7 @@ class ApiQueryLogEvents extends ApiQueryBase { ], ]; - if ( $config->get( 'MiserMode' ) ) { + if ( $config->get( MainConfigNames::MiserMode ) ) { $ret['prefix'][ApiBase::PARAM_HELP_MSG] = 'api-help-param-disabled-in-miser-mode'; } diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php index c0eaf3696fbf..d0a32d33d83b 100644 --- a/includes/api/ApiQueryProtectedTitles.php +++ b/includes/api/ApiQueryProtectedTitles.php @@ -21,6 +21,7 @@ */ use MediaWiki\CommentFormatter\RowCommentFormatter; +use MediaWiki\MainConfigNames; /** * Query module to enumerate all create-protected pages. @@ -217,7 +218,8 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase { ], 'level' => [ ApiBase::PARAM_ISMULTI => true, - ApiBase::PARAM_TYPE => array_diff( $this->getConfig()->get( 'RestrictionLevels' ), [ '' ] ) + ApiBase::PARAM_TYPE => array_diff( + $this->getConfig()->get( MainConfigNames::RestrictionLevels ), [ '' ] ) ], 'limit' => [ ApiBase::PARAM_DFLT => 10, diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index b5345356f318..ceb26a0a2e97 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPageFactory; /** @@ -52,7 +53,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { parent::__construct( $query, $moduleName, 'qp' ); $this->queryPages = array_values( array_diff( array_column( QueryPage::getPages(), 1 ), // [ class, name ] - $this->getConfig()->get( 'APIUselessQueryPages' ) + $this->getConfig()->get( MainConfigNames::APIUselessQueryPages ) ) ); $this->specialPageFactory = $specialPageFactory; } @@ -109,7 +110,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { if ( $ts ) { $r['cachedtimestamp'] = wfTimestamp( TS_ISO_8601, $ts ); } - $r['maxresults'] = $this->getConfig()->get( 'QueryCacheLimit' ); + $r['maxresults'] = $this->getConfig()->get( MainConfigNames::QueryCacheLimit ); } } $result->addValue( [ 'query' ], $this->getModuleName(), $r ); diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 52199ae8db4b..b3a50482b046 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -21,6 +21,7 @@ */ use MediaWiki\CommentFormatter\RowCommentFormatter; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRoleRegistry; @@ -418,7 +419,7 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { $this->addOption( 'LIMIT', $params['limit'] + 1 ); $this->addOption( 'MAX_EXECUTION_TIME', - $this->getConfig()->get( 'MaxExecutionTimeForExpensiveQueries' ) + $this->getConfig()->get( MainConfigNames::MaxExecutionTimeForExpensiveQueries ) ); $hookData = []; diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index f3fb45a4ad64..67e80dab6b26 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -23,6 +23,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -149,7 +150,8 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { $useIndex = []; if ( $params['user'] !== null && - ( $this->getConfig()->get( 'ActorTableSchemaMigrationStage' ) & SCHEMA_COMPAT_READ_TEMP ) + ( $this->getConfig()->get( MainConfigNames::ActorTableSchemaMigrationStage ) + & SCHEMA_COMPAT_READ_TEMP ) ) { // We're going to want to use the page_actor_timestamp index (on revision_actor_temp) // so use that table's denormalized fields. diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index 90e8e7984374..9bcb76b5c7d3 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -24,6 +24,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; @@ -660,7 +661,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase { if ( $content && ( $this->diffto !== null || $this->difftotext !== null ) ) { static $n = 0; // Number of uncached diffs we've had - if ( $n < $this->getConfig()->get( 'APIMaxUncachedDiffs' ) ) { + if ( $n < $this->getConfig()->get( MainConfigNames::APIMaxUncachedDiffs ) ) { $vals['diff'] = []; $context = new DerivativeContext( $this->getContext() ); $context->setTitle( $title ); diff --git a/includes/api/ApiQueryUserContribs.php b/includes/api/ApiQueryUserContribs.php index 326dded41ddb..d2b6646d3ba4 100644 --- a/includes/api/ApiQueryUserContribs.php +++ b/includes/api/ApiQueryUserContribs.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -315,7 +316,8 @@ class ApiQueryUserContribs extends ApiQueryBase { $revQuery = $this->revisionStore->getQueryInfo( [ 'page' ] ); $revWhere = $this->actorMigration->getWhere( $db, 'rev_user', $users ); - if ( $this->getConfig()->get( 'ActorTableSchemaMigrationStage' ) & SCHEMA_COMPAT_READ_TEMP ) { + if ( $this->getConfig()->get( MainConfigNames::ActorTableSchemaMigrationStage ) & + SCHEMA_COMPAT_READ_TEMP ) { $orderUserField = 'rev_actor'; $userField = $this->orderBy === 'actor' ? 'revactor_actor' : 'actor_name'; $tsField = 'revactor_timestamp'; @@ -490,7 +492,7 @@ class ApiQueryUserContribs extends ApiQueryBase { } $this->addOption( 'MAX_EXECUTION_TIME', - $this->getConfig()->get( 'MaxExecutionTimeForExpensiveQueries' ) + $this->getConfig()->get( MainConfigNames::MaxExecutionTimeForExpensiveQueries ) ); } @@ -692,7 +694,7 @@ class ApiQueryUserContribs extends ApiQueryBase { ], ApiBase::PARAM_HELP_MSG => [ 'apihelp-query+usercontribs-param-show', - $this->getConfig()->get( 'RCMaxAge' ) + $this->getConfig()->get( MainConfigNames::RCMaxAge ) ], ], 'tag' => null, diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php index 5a75bbd3ffaa..4dd31b93d333 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\TalkPageNotificationManager; use MediaWiki\User\UserEditTracker; @@ -122,7 +123,7 @@ class ApiQueryUserInfo extends ApiQueryBase { UserIdentity $user, $attachedWiki = UserIdentity::LOCAL ) { - $providerIds = array_keys( $config->get( 'CentralIdLookupProviders' ) ); + $providerIds = array_keys( $config->get( MainConfigNames::CentralIdLookupProviders ) ); $ret = [ 'centralids' => [], @@ -231,7 +232,7 @@ class ApiQueryUserInfo extends ApiQueryBase { } if ( isset( $this->prop['realname'] ) && - !in_array( 'realname', $this->getConfig()->get( 'HiddenPrefs' ) ) + !in_array( 'realname', $this->getConfig()->get( MainConfigNames::HiddenPrefs ) ) ) { $vals['realname'] = $user->getRealName(); } @@ -326,7 +327,7 @@ class ApiQueryUserInfo extends ApiQueryBase { $categories = array_merge( $categories, $this->userGroupManager->getUserGroups( $user ) ); // Now get the actual limits - foreach ( $this->getConfig()->get( 'RateLimits' ) as $action => $limits ) { + foreach ( $this->getConfig()->get( MainConfigNames::RateLimits ) as $action => $limits ) { foreach ( $categories as $cat ) { if ( isset( $limits[$cat] ) ) { $retval[$action][$cat]['hits'] = (int)$limits[$cat][0]; diff --git a/includes/api/ApiRemoveAuthenticationData.php b/includes/api/ApiRemoveAuthenticationData.php index df8cdaa91e7a..46a04c543779 100644 --- a/includes/api/ApiRemoveAuthenticationData.php +++ b/includes/api/ApiRemoveAuthenticationData.php @@ -22,6 +22,7 @@ use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthManager; +use MediaWiki\MainConfigNames; /** * Remove authentication data from AuthManager @@ -72,7 +73,8 @@ class ApiRemoveAuthenticationData extends ApiBase { // Fetch the request. No need to load from the request, so don't use // ApiAuthManagerHelper's method. $remove = $this->authAction === AuthManager::ACTION_REMOVE - ? array_fill_keys( $this->getConfig()->get( 'RemoveCredentialsBlacklist' ), true ) + ? array_fill_keys( $this->getConfig()->get( + MainConfigNames::RemoveCredentialsBlacklist ), true ) : []; $reqs = array_filter( $this->authManager->getAuthenticationRequests( $this->authAction, $this->getUser() ), diff --git a/includes/api/ApiResetPassword.php b/includes/api/ApiResetPassword.php index b63cb53c99bf..3c94463a80a6 100644 --- a/includes/api/ApiResetPassword.php +++ b/includes/api/ApiResetPassword.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; /** @@ -56,7 +57,7 @@ class ApiResetPassword extends ApiBase { */ private function hasAnyRoutes() { if ( $this->hasAnyRoutes === null ) { - $resetRoutes = $this->getConfig()->get( 'PasswordResetRoutes' ); + $resetRoutes = $this->getConfig()->get( MainConfigNames::PasswordResetRoutes ); $this->hasAnyRoutes = !empty( $resetRoutes['username'] ) || !empty( $resetRoutes['email'] ); } return $this->hasAnyRoutes; @@ -125,7 +126,7 @@ class ApiResetPassword extends ApiBase { ], ]; - $resetRoutes = $this->getConfig()->get( 'PasswordResetRoutes' ); + $resetRoutes = $this->getConfig()->get( MainConfigNames::PasswordResetRoutes ); if ( empty( $resetRoutes['username'] ) ) { unset( $ret['user'] ); } @@ -138,7 +139,7 @@ class ApiResetPassword extends ApiBase { protected function getExamplesMessages() { $ret = []; - $resetRoutes = $this->getConfig()->get( 'PasswordResetRoutes' ); + $resetRoutes = $this->getConfig()->get( MainConfigNames::PasswordResetRoutes ); if ( !empty( $resetRoutes['username'] ) ) { $ret['action=resetpassword&user=Example&token=123ABC'] = 'apihelp-resetpassword-example-user'; diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php index f246a8198af3..727a4f4ffe10 100644 --- a/includes/api/ApiRollback.php +++ b/includes/api/ApiRollback.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Page\RollbackPageFactory; use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\User\UserIdentity; @@ -47,8 +48,9 @@ class ApiRollback extends ApiBase { $this->rollbackPageFactory = $rollbackPageFactory; // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } @@ -82,7 +84,7 @@ class ApiRollback extends ApiBase { // @TODO: remove this hack once rollback uses POST (T88044) $fname = __METHOD__; - $trxLimits = $this->getConfig()->get( 'TrxProfilerLimits' ); + $trxLimits = $this->getConfig()->get( MainConfigNames::TrxProfilerLimits ); $trxProfiler = Profiler::instance()->getTransactionProfiler(); $trxProfiler->redefineExpectations( $trxLimits['POST'], $fname ); DeferredUpdates::addCallableUpdate( static function () use ( $trxProfiler, $trxLimits, $fname ) { diff --git a/includes/api/ApiSetPageLanguage.php b/includes/api/ApiSetPageLanguage.php index 20cbf91f4c24..cc2b2da1da41 100644 --- a/includes/api/ApiSetPageLanguage.php +++ b/includes/api/ApiSetPageLanguage.php @@ -21,6 +21,7 @@ */ use MediaWiki\Languages\LanguageNameUtils; +use MediaWiki\MainConfigNames; use Wikimedia\Rdbms\ILoadBalancer; /** @@ -57,7 +58,7 @@ class ApiSetPageLanguage extends ApiBase { // Check if change language feature is enabled protected function getExtendedDescription() { - if ( !$this->getConfig()->get( 'PageLanguageUseDB' ) ) { + if ( !$this->getConfig()->get( MainConfigNames::PageLanguageUseDB ) ) { return 'apihelp-setpagelanguage-extended-description-disabled'; } return parent::getExtendedDescription(); @@ -72,7 +73,7 @@ class ApiSetPageLanguage extends ApiBase { */ public function execute() { // Check if change language feature is enabled - if ( !$this->getConfig()->get( 'PageLanguageUseDB' ) ) { + if ( !$this->getConfig()->get( MainConfigNames::PageLanguageUseDB ) ) { $this->dieWithError( 'apierror-pagelang-disabled' ); } diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php index 2c744e935e72..59bdea8fb260 100644 --- a/includes/api/ApiUndelete.php +++ b/includes/api/ApiUndelete.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Page\UndeletePage; use MediaWiki\Page\UndeletePageFactory; use MediaWiki\Page\WikiPageFactory; @@ -59,8 +60,9 @@ class ApiUndelete extends ApiBase { parent::__construct( $mainModule, $moduleName ); // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; $this->undeletePageFactory = $undeletePageFactory; diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index 04a5c73dd746..27e5cac76cff 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\User\UserOptionsLookup; use MediaWiki\Watchlist\WatchlistManager; @@ -56,8 +57,9 @@ class ApiUpload extends ApiBase { $this->jobQueueGroup = $jobQueueGroup; // Variables needed in ApiWatchlistTrait trait - $this->watchlistExpiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->watchlistMaxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->watchlistExpiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->watchlistMaxDuration = + $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); $this->watchlistManager = $watchlistManager; $this->userOptionsLookup = $userOptionsLookup; } @@ -75,7 +77,7 @@ class ApiUpload extends ApiBase { $request = $this->getMain()->getRequest(); // Check if async mode is actually supported (jobs done in cli mode) $this->mParams['async'] = ( $this->mParams['async'] && - $this->getConfig()->get( 'EnableAsyncUploads' ) ); + $this->getConfig()->get( MainConfigNames::EnableAsyncUploads ) ); // Add the uploaded file to the params array $this->mParams['file'] = $request->getFileName( 'file' ); $this->mParams['chunk'] = $request->getFileName( 'chunk' ); @@ -208,7 +210,7 @@ class ApiUpload extends ApiBase { * @return int */ public static function getMinUploadChunkSize( Config $config ) { - $configured = $config->get( 'MinUploadChunkSize' ); + $configured = $config->get( MainConfigNames::MinUploadChunkSize ); // Leave some room for other POST parameters $postMax = ( @@ -683,9 +685,11 @@ class ApiUpload extends ApiBase { case UploadBase::FILETYPE_BADTYPE: $extradata = [ 'filetype' => $verification['finalExt'], - 'allowed' => array_values( array_unique( $this->getConfig()->get( 'FileExtensions' ) ) ) + 'allowed' => array_values( array_unique( + $this->getConfig()->get( MainConfigNames::FileExtensions ) ) ) ]; - $extensions = array_unique( $this->getConfig()->get( 'FileExtensions' ) ); + $extensions = + array_unique( $this->getConfig()->get( MainConfigNames::FileExtensions ) ); $msg = [ 'filetype-banned-type', null, // filled in below diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php index 03290efc4d27..284c46cfa90c 100644 --- a/includes/api/ApiWatch.php +++ b/includes/api/ApiWatch.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\MainConfigNames; use MediaWiki\Watchlist\WatchlistManager; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; @@ -45,8 +46,8 @@ class ApiWatch extends ApiBase { parent::__construct( $mainModule, $moduleName ); $this->watchlistManager = $watchlistManager; - $this->expiryEnabled = $this->getConfig()->get( 'WatchlistExpiry' ); - $this->maxDuration = $this->getConfig()->get( 'WatchlistExpiryMaxDuration' ); + $this->expiryEnabled = $this->getConfig()->get( MainConfigNames::WatchlistExpiry ); + $this->maxDuration = $this->getConfig()->get( MainConfigNames::WatchlistExpiryMaxDuration ); } public function execute() { |