SettingsBuilder: prevent access to the global instance in unit tests

Unit tests must use dependency injection, not global instances.

Change-Id: If7e35a67edc2337657bec4e35724d7f6bc034418

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/phpunit/MediaWikiUnitTestCase.php b/tests/phpunit/MediaWikiUnitTestCase.php
index 9ce538d7deaa..188addac7a9e 100644
--- a/tests/phpunit/MediaWikiUnitTestCase.php
+++ b/tests/phpunit/MediaWikiUnitTestCase.php
@@ -22,6 +22,7 @@
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Logger\NullSpi;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Settings\SettingsBuilder;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
 use Wikimedia\ObjectFactory\ObjectFactory;
@@ -107,6 +108,7 @@ abstract class MediaWikiUnitTestCase extends TestCase {
 		DeferredUpdates::setScopeStack( new DeferredUpdatesScopeStack() );
 		MediaWikiServices::disallowGlobalInstanceInUnitTests();
 		ExtensionRegistry::disableForTest();
+		SettingsBuilder::disableAccessForUnitTests();
 	}
 
 	/**
@@ -165,6 +167,7 @@ abstract class MediaWikiUnitTestCase extends TestCase {
 		MediaWikiServices::allowGlobalInstanceAfterUnitTests();
 		DeferredUpdates::setScopeStack( new DeferredUpdatesScopeMediaWikiStack() );
 		ExtensionRegistry::enableForTest();
+		SettingsBuilder::enableAccessAfterUnitTests();
 	}
 
 }