Merge "tests: Use TestingAccessWrapper to reload LanguageConverter tables"

diff --combined tests/parser/ParserTestRunner.php
index 6d5910d,5aba371..a373142
--- 1/tests/parser/ParserTestRunner.php
--- 2/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@@ -28,6 -28,7 +28,7 @@@
  use Wikimedia\Rdbms\IDatabase;
  use MediaWiki\MediaWikiServices;
  use Wikimedia\ScopedCallback;
+ use Wikimedia\TestingAccessWrapper;
  
  /**
   * @ingroup Testing
@@@ -240,7 -241,7 +241,7 @@@ class ParserTestRunner 
                        'name' => 'nullLockManager',
                        'class' => 'NullLockManager',
                ] ];
 -              $reset = function() {
 +              $reset = function () {
                        LockManagerGroup::destroySingletons();
                };
                $setup[] = $reset;
@@@ -288,7 -289,7 +289,7 @@@
                MediaWikiServices::getInstance()->disableService( 'MediaHandlerFactory' );
                MediaWikiServices::getInstance()->redefineService(
                        'MediaHandlerFactory',
 -                      function() {
 +                      function () {
                                return new MockMediaHandlerFactory();
                        }
                );
@@@ -428,7 -429,7 +429,7 @@@
         * @return ScopedCallback
         */
        protected function createTeardownObject( $teardown, $nextTeardown = null ) {
 -              return new ScopedCallback( function() use ( $teardown, $nextTeardown ) {
 +              return new ScopedCallback( function () use ( $teardown, $nextTeardown ) {
                        // Schedule teardown snippets in reverse order
                        $teardown = array_reverse( $teardown );
  
@@@ -1046,7 -1047,10 +1047,10 @@@
                $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'] );