* @file
*/
+use MediaWiki\MediaWikiServices;
+
/**
* This is the abstract base class for API formatters.
*
} elseif ( $this->getIsHtml() ) {
return 'api-result.html';
} else {
- $exts = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer()
+ $exts = MediaWikiServices::getInstance()->getMimeAnalyzer()
->getExtensionsForType( $this->getMimeType() );
$ext = $exts ? strtok( $exts, ' ' ) : strtolower( $this->mFormat );
return "api-result.$ext";
$result = $this->getBuffer();
$context = new DerivativeContext( $this->getMain() );
- $context->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'apioutput' ) );
+ $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+ $context->setSkin( $skinFactory->makeSkin( 'apioutput' ) );
$context->setTitle( SpecialPage::getTitleFor( 'ApiHelp' ) );
$out = new OutputPage( $context );
$context->setOutput( $out );
// Get the help
$context = new DerivativeContext( $this->getMain()->getContext() );
- $context->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'apioutput' ) );
+ $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+ $context->setSkin( $skinFactory->makeSkin( 'apioutput' ) );
$context->setLanguage( $this->getMain()->getLanguage() );
$context->setTitle( SpecialPage::getTitleFor( 'ApiHelp' ) );
$out = new OutputPage( $context );
* @file
*/
+use MediaWiki\MediaWikiServices;
+
/**
* BaseTemplate class for the fallback skin
*/
private function buildHelpfulInformationMessage() {
$defaultSkin = $this->config->get( 'DefaultSkin' );
$installedSkins = $this->findInstalledSkins();
- $enabledSkins = SkinFactory::getDefaultInstance()->getSkinNames();
+ $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+ $enabledSkins = $skinFactory->getSkinNames();
$enabledSkins = array_change_key_case( $enabledSkins, CASE_LOWER );
if ( $installedSkins ) {
wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
}
- return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
+ return $this->mArgs[$argId] ?? $default;
}
/**
<?php
+use MediaWiki\MediaWikiServices;
use Wikimedia\TestingAccessWrapper;
/**
$method = $class->getMethod( 'makeResourceLoaderLink' );
$method->setAccessible( true );
$ctx = new RequestContext();
- $ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
+ $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+ $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) );
$ctx->setLanguage( 'en' );
$out = new OutputPage( $ctx );
$nonce = $class->getProperty( 'CSPNonce' );
// Set up stubs
$ctx = new RequestContext();
- $ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
+ $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+ $ctx->setSkin( $skinFactory->makeSkin( 'fallback' ) );
$ctx->setLanguage( 'en' );
$op = $this->getMockBuilder( OutputPage::class )
->setConstructorArgs( [ $ctx ] )
protected function setUp() {
parent::setUp();
+ $skinFactory = new SkinFactory();
// The return value of the closure shouldn't matter since this test should
// never call it
- SkinFactory::getDefaultInstance()->register(
+ $skinFactory->register(
'fakeskin',
'FakeSkin',
function () {
}
);
+ $this->setService( 'SkinFactory', $skinFactory );
}
private static function getModules() {
] );
// Pretend that 'fakemonobook' is a real skin using the Apex theme
- SkinFactory::getDefaultInstance()->register(
+ $skinFactory = new SkinFactory();
+ $skinFactory->register(
'fakemonobook',
'FakeMonoBook',
function () {
}
);
+ $this->setService( 'SkinFactory', $skinFactory );
+
$r = new ReflectionMethod( ExtensionRegistry::class, 'exportExtractedData' );
$r->setAccessible( true );
$r->invoke( ExtensionRegistry::getInstance(), [