Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use MainConfigNames constant to refer configs

Browse source 
Change-Id: Iddef589423d1e3f609b3cfbf6cc7437c6ad830b0
This commit is contained in:
Umherirrender 2022-08-17 21:27:48 +02:00
parent 4225028026
commit 0f49ae2759
5 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Rest/Handler/ParsoidHandler.php
View file

@ -25,6 +25,7 @@ use InvalidArgumentException;
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use LogicException;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\Parsoid\HTMLTransform;
use MediaWiki\Rest\Handler;
@ -93,7 +94,7 @@ abstract class ParsoidHandler extends Handler {
$services = MediaWikiServices::getInstance();
// @phan-suppress-next-line PhanTypeInstantiateAbstractStatic
return new static(
$services->getMainConfig()->get( 'ParsoidSettings' ),
$services->getMainConfig()->get( MainConfigNames::ParsoidSettings ),
$services->getParsoidSiteConfig(),
$services->getParsoidPageConfigFactory(),
$services->getParsoidDataAccess()
@ -131,7 +132,7 @@ abstract class ParsoidHandler extends Handler {
// We are cutting some corners here (IDN, non-ASCII casing)
// since domain name support is provisional.
// TODO use a proper validator instead
$server = \RequestContext::getMain()->getConfig()->get( 'Server' );
$server = \RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
$expectedDomain = wfParseUrl( $server )['host'] ?? null;
if ( !$expectedDomain ) {
throw new LogicException( 'Cannot parse $wgServer' );

2
includes/ServiceWiring.php
View file

@ -2189,7 +2189,7 @@ return [
'WRStatsFactory' => static function ( MediaWikiServices $services ): WRStatsFactory {
return new WRStatsFactory(
new BagOStuffStatsStore(
ObjectCache::getInstance( $services->getMainConfig()->get( 'StatsCacheType' ) )
ObjectCache::getInstance( $services->getMainConfig()->get( MainConfigNames::StatsCacheType ) )
)
);
},

2
includes/api/ApiQueryUserContribs.php
View file

@ -204,7 +204,7 @@ class ApiQueryUserContribs extends ApiQueryBase {
} elseif ( isset( $this->params['iprange'] ) ) {
// Make sure it is a valid range and within the CIDR limit
$ipRange = $this->params['iprange'];
$contribsCIDRLimit = $this->getConfig()->get( 'RangeContributionsCIDRLimit' );
$contribsCIDRLimit = $this->getConfig()->get( MainConfigNames::RangeContributionsCIDRLimit );
if ( IPUtils::isIPv4( $ipRange ) ) {
$type = 'IPv4';
$cidrLimit = $contribsCIDRLimit['IPv4'];

4
includes/exception/MWExceptionRenderer.php
View file

@ -374,8 +374,8 @@ class MWExceptionRenderer {
*/
private static function reportOutageHTML( Throwable $e ) {
$mainConfig = MediaWikiServices::getInstance()->getMainConfig();
$showExceptionDetails = $mainConfig->get( 'ShowExceptionDetails' );
$showHostnames = $mainConfig->get( 'ShowHostnames' );
$showExceptionDetails = $mainConfig->get( MainConfigNames::ShowExceptionDetails );
$showHostnames = $mainConfig->get( MainConfigNames::ShowHostnames );
$sorry = htmlspecialchars( self::msg(
'dberr-problems',
'Sorry! This site is experiencing technical difficulties.'

52
includes/installer/Installer.php
View file

@ -171,32 +171,32 @@ abstract class Installer {
* @var array
*/
private const DEFAULT_VAR_NAMES = [
'Sitename',
'PasswordSender',
'LanguageCode',
'Localtimezone',
'RightsIcon',
'RightsText',
'RightsUrl',
'EnableEmail',
'EnableUserEmail',
'EnotifUserTalk',
'EnotifWatchlist',
'EmailAuthentication',
'DBname',
'DBtype',
'Diff3',
'ImageMagickConvertCommand',
'GitBin',
'ScriptPath',
'MetaNamespace',
'DeletedDirectory',
'EnableUploads',
'SecretKey',
'UseInstantCommons',
'UpgradeKey',
'DefaultSkin',
'Pingback',
MainConfigNames::Sitename,
MainConfigNames::PasswordSender,
MainConfigNames::LanguageCode,
MainConfigNames::Localtimezone,
MainConfigNames::RightsIcon,
MainConfigNames::RightsText,
MainConfigNames::RightsUrl,
MainConfigNames::EnableEmail,
MainConfigNames::EnableUserEmail,
MainConfigNames::EnotifUserTalk,
MainConfigNames::EnotifWatchlist,
MainConfigNames::EmailAuthentication,
MainConfigNames::DBname,
MainConfigNames::DBtype,
MainConfigNames::Diff3,
MainConfigNames::ImageMagickConvertCommand,
MainConfigNames::GitBin,
MainConfigNames::ScriptPath,
MainConfigNames::MetaNamespace,
MainConfigNames::DeletedDirectory,
MainConfigNames::EnableUploads,
MainConfigNames::SecretKey,
MainConfigNames::UseInstantCommons,
MainConfigNames::UpgradeKey,
MainConfigNames::DefaultSkin,
MainConfigNames::Pingback,
];
/**