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

Deprecate no LanguageNameUtils constructing DefaultPrederencesFactory

Browse source 
Depends-On: I3e30bc01ec9333d03e1282a21ae8953ae1f7c770
Change-Id: Ifd9628469bf72ffaa6ab75415ee18edd416cffe2
This commit is contained in:
Petr Pchelko 2020-02-19 10:32:26 -08:00
parent 40214bd908
commit 2501625352
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/preferences/DefaultPreferencesFactory.php
View file

@ -149,8 +149,6 @@ class DefaultPreferencesFactory implements PreferencesFactory {
$this->linkRenderer = $linkRenderer;
$this->nsInfo = $nsInfo;
$this->permissionManager = $permissionManager;
$this->languageNameUtils = $languageNameUtils ??
MediaWikiServices::getInstance()->getLanguageNameUtils();
$this->logger = new NullLogger();
if ( !$languageConverter ) {
@ -160,6 +158,12 @@ class DefaultPreferencesFactory implements PreferencesFactory {
->getLanguageConverter();
}
$this->languageConverter = $languageConverter;
if ( !$languageNameUtils ) {
wfDeprecated( __METHOD__ . ' without $languageNameUtils parameter', '1.35' );
$languageNameUtils = MediaWikiServices::getInstance()->getLanguageNameUtils();
}
$this->languageNameUtils = $languageNameUtils;
}
/**

3
tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
View file

@ -73,7 +73,8 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
$mockNsInfo,
$mockPM,
MediaWikiServices::getInstance()->getLanguageConverterFactory()
->getLanguageConverter( $language )
->getLanguageConverter( $language ),
MediaWikiServices::getInstance()->getLanguageNameUtils()
);
}