Make the LanguageConverter::reloadTables method actually private,
and use the TestingAccessWrapper to call it when running parser tests.
Follow-up to I65736520cd04bfe8949b29ade07338a6e1b88a4d.
Change-Id: I43b81b8fef6441ad50b858ff7757732ecb5eef91
public function updateConversionTable( Title $title ) {
}
public function updateConversionTable( Title $title ) {
}
- public function reloadTables() {
+ /**
+ * Used by test suites which need to reset the converter state.
+ *
+ * @private
+ */
+ private function reloadTables() {
/**
* Reload the conversion tables.
*
/**
* Reload the conversion tables.
*
- * Public only for use by test suites which need to reset the converter
- * state.
+ * Also used by test suites which need to reset the converter state.
- function reloadTables() {
+ private function reloadTables() {
if ( $this->mTables ) {
unset( $this->mTables );
}
if ( $this->mTables ) {
unset( $this->mTables );
}
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
use Wikimedia\ScopedCallback;
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
use Wikimedia\ScopedCallback;
+use Wikimedia\TestingAccessWrapper;
$context->setLanguage( $lang );
$teardown[] = function () use ( $context ) {
// Clear language conversion tables
$context->setLanguage( $lang );
$teardown[] = function () use ( $context ) {
// Clear language conversion tables
- $context->getLanguage()->getConverter()->reloadTables();
+ $wrapper = TestingAccessWrapper::newFromObject(
+ $context->getLanguage()->getConverter()
+ );
+ $wrapper->reloadTables();
// Reset context to the restored globals
$context->setUser( $GLOBALS['wgUser'] );
$context->setLanguage( $GLOBALS['wgContLang'] );
// Reset context to the restored globals
$context->setUser( $GLOBALS['wgUser'] );
$context->setLanguage( $GLOBALS['wgContLang'] );