aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/unit
diff options
context:
space:
mode:
authorUmherirrender <umherirrender_de.wp@web.de>2022-08-17 22:33:06 +0200
committerUmherirrender <umherirrender_de.wp@web.de>2022-08-17 22:33:58 +0200
commit167fb2a9792e77a56be6701a7f7ec72c4529c871 (patch)
tree7f684136253e746d9daeb0fb7e7c41d4d4f07254 /tests/phpunit/unit
parent44735dff5a264adf324b0d0d49b1f8a0863356cf (diff)
downloadmediawikicore-167fb2a9792e77a56be6701a7f7ec72c4529c871.tar.gz
mediawikicore-167fb2a9792e77a56be6701a7f7ec72c4529c871.zip
unit tests: Use MainConfigNames constant to refer configs
When creating ServiceOptions objects or fake HashConfigs use the constant to refer the config name Change-Id: I59a29f25b76e896c07e82156c6cc4494f98e64cc
Diffstat (limited to 'tests/phpunit/unit')
-rw-r--r--tests/phpunit/unit/includes/FauxResponseTest.php14
-rw-r--r--tests/phpunit/unit/includes/Permissions/GrantsInfoTest.php5
-rw-r--r--tests/phpunit/unit/includes/Permissions/GroupPermissionsLookupTest.php7
-rw-r--r--tests/phpunit/unit/includes/Permissions/PermissionManagerTest.php27
-rw-r--r--tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php59
-rw-r--r--tests/phpunit/unit/includes/PingbackTest.php3
-rw-r--r--tests/phpunit/unit/includes/Rest/CorsUtilsTest.php27
-rw-r--r--tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php9
-rw-r--r--tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php9
-rw-r--r--tests/phpunit/unit/includes/Storage/EditResultBuilderTest.php3
-rw-r--r--tests/phpunit/unit/includes/Storage/EditResultCacheTest.php9
-rw-r--r--tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php15
-rw-r--r--tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php3
-rw-r--r--tests/phpunit/unit/includes/block/BlockPermissionCheckerTest.php3
-rw-r--r--tests/phpunit/unit/includes/block/BlockUtilsTest.php3
-rw-r--r--tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php3
-rw-r--r--tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php23
-rw-r--r--tests/phpunit/unit/includes/http/HttpRequestFactoryTest.php53
-rw-r--r--tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php9
-rw-r--r--tests/phpunit/unit/includes/language/LanguageNameUtilsTest.php7
-rw-r--r--tests/phpunit/unit/includes/language/LanguageNameUtilsTestTrait.php9
-rw-r--r--tests/phpunit/unit/includes/page/DeletePageTest.php5
-rw-r--r--tests/phpunit/unit/includes/page/PageCommandFactoryTest.php13
-rw-r--r--tests/phpunit/unit/includes/page/PageStoreFactoryTest.php5
-rw-r--r--tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php5
-rw-r--r--tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php93
-rw-r--r--tests/phpunit/unit/includes/password/PasswordFactoryTest.php6
-rw-r--r--tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php7
-rw-r--r--tests/phpunit/unit/includes/tidy/RemexDriverTest.php5
-rw-r--r--tests/phpunit/unit/includes/user/ActorStoreFactoryTest.php17
-rw-r--r--tests/phpunit/unit/includes/user/CentralId/CentralIdLookupFactoryTest.php11
-rw-r--r--tests/phpunit/unit/includes/user/UserNameUtilsTest.php3
-rw-r--r--tests/phpunit/unit/includes/watchlist/WatchlistManagerTest.php11
33 files changed, 258 insertions, 223 deletions
diff --git a/tests/phpunit/unit/includes/FauxResponseTest.php b/tests/phpunit/unit/includes/FauxResponseTest.php
index 022be5a7f0f3..da992ba40aa9 100644
--- a/tests/phpunit/unit/includes/FauxResponseTest.php
+++ b/tests/phpunit/unit/includes/FauxResponseTest.php
@@ -20,6 +20,8 @@
* @file
*/
+use MediaWiki\MainConfigNames;
+
class FauxResponseTest extends \MediaWikiUnitTestCase {
/** @var FauxResponse */
protected $response;
@@ -48,12 +50,12 @@ class FauxResponseTest extends \MediaWikiUnitTestCase {
];
$this->response->setCookieConfig( new HashConfig( [
- 'CookiePath' => '/',
- 'CookiePrefix' => false,
- 'CookieDomain' => '',
- 'CookieSecure' => 'detect',
- 'CookieExpiration' => '60',
- 'CookieHttpOnly' => true,
+ MainConfigNames::CookiePath => '/',
+ MainConfigNames::CookiePrefix => false,
+ MainConfigNames::CookieDomain => '',
+ MainConfigNames::CookieSecure => 'detect',
+ MainConfigNames::CookieExpiration => '60',
+ MainConfigNames::CookieHttpOnly => true,
] ) );
$this->assertNull( $this->response->getCookie( 'xkey' ), 'Non-existing cookie' );
diff --git a/tests/phpunit/unit/includes/Permissions/GrantsInfoTest.php b/tests/phpunit/unit/includes/Permissions/GrantsInfoTest.php
index 3a7ed9010aa5..b90fa48bf2d2 100644
--- a/tests/phpunit/unit/includes/Permissions/GrantsInfoTest.php
+++ b/tests/phpunit/unit/includes/Permissions/GrantsInfoTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\Unit\Permissions;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\GrantsInfo;
use MediaWikiUnitTestCase;
@@ -18,14 +19,14 @@ class GrantsInfoTest extends MediaWikiUnitTestCase {
parent::setUp();
$config = [
- 'GrantPermissions' => [
+ MainConfigNames::GrantPermissions => [
'hidden1' => [ 'read' => true, 'autoconfirmed' => false ],
'hidden2' => [ 'autoconfirmed' => true ],
'normal' => [ 'edit' => true ],
'normal2' => [ 'edit' => true, 'create' => true ],
'admin' => [ 'protect' => true, 'delete' => true ],
],
- 'GrantPermissionGroups' => [
+ MainConfigNames::GrantPermissionGroups => [
'hidden1' => 'hidden',
'hidden2' => 'hidden',
'normal' => 'normal-group',
diff --git a/tests/phpunit/unit/includes/Permissions/GroupPermissionsLookupTest.php b/tests/phpunit/unit/includes/Permissions/GroupPermissionsLookupTest.php
index e03158f32ade..e9c3a9250174 100644
--- a/tests/phpunit/unit/includes/Permissions/GroupPermissionsLookupTest.php
+++ b/tests/phpunit/unit/includes/Permissions/GroupPermissionsLookupTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\Unit\Permissions;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\GroupPermissionsLookup;
use MediaWikiUnitTestCase;
@@ -14,7 +15,7 @@ class GroupPermissionsLookupTest extends MediaWikiUnitTestCase {
private function createGroupPermissionsLookup(): GroupPermissionsLookup {
return new GroupPermissionsLookup(
new ServiceOptions( GroupPermissionsLookup::CONSTRUCTOR_OPTIONS, [
- 'GroupPermissions' => [
+ MainConfigNames::GroupPermissions => [
'unittesters' => [
'test' => true,
'runtest' => true,
@@ -26,7 +27,7 @@ class GroupPermissionsLookupTest extends MediaWikiUnitTestCase {
'modifytest' => true,
],
],
- 'RevokePermissions' => [
+ MainConfigNames::RevokePermissions => [
'unittesters' => [
'nukeworld' => true,
],
@@ -34,7 +35,7 @@ class GroupPermissionsLookupTest extends MediaWikiUnitTestCase {
'runtest' => true,
],
],
- 'GroupInheritsPermissions' => [
+ MainConfigNames::GroupInheritsPermissions => [
'inheritedtesters' => 'unittesters',
],
] )
diff --git a/tests/phpunit/unit/includes/Permissions/PermissionManagerTest.php b/tests/phpunit/unit/includes/Permissions/PermissionManagerTest.php
index 761f5d47e2b1..1dc3ea88b47a 100644
--- a/tests/phpunit/unit/includes/Permissions/PermissionManagerTest.php
+++ b/tests/phpunit/unit/includes/Permissions/PermissionManagerTest.php
@@ -6,6 +6,7 @@ use MediaWiki\Actions\ActionFactory;
use MediaWiki\Block\BlockErrorFormatter;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\RedirectLookup;
use MediaWiki\Permissions\GroupPermissionsLookup;
use MediaWiki\Permissions\PermissionManager;
@@ -34,18 +35,18 @@ class PermissionManagerTest extends MediaWikiUnitTestCase {
private function getPermissionManager( $options = [] ) {
$overrideConfig = $options['config'] ?? [];
$baseConfig = [
- 'WhitelistRead' => false,
- 'WhitelistReadRegexp' => false,
- 'EmailConfirmToEdit' => false,
- 'BlockDisablesLogin' => false,
- 'EnablePartialActionBlocks' => false,
- 'GroupPermissions' => [],
- 'RevokePermissions' => [],
- 'GroupInheritsPermissions' => [],
- 'AvailableRights' => [],
- 'NamespaceProtection' => [ NS_MEDIAWIKI => 'editinterface' ],
- 'RestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ],
- 'DeleteRevisionsLimit' => false,
+ MainConfigNames::WhitelistRead => false,
+ MainConfigNames::WhitelistReadRegexp => false,
+ MainConfigNames::EmailConfirmToEdit => false,
+ MainConfigNames::BlockDisablesLogin => false,
+ MainConfigNames::EnablePartialActionBlocks => false,
+ MainConfigNames::GroupPermissions => [],
+ MainConfigNames::RevokePermissions => [],
+ MainConfigNames::GroupInheritsPermissions => [],
+ MainConfigNames::AvailableRights => [],
+ MainConfigNames::NamespaceProtection => [ NS_MEDIAWIKI => 'editinterface' ],
+ MainConfigNames::RestrictionLevels => [ '', 'autoconfirmed', 'sysop' ],
+ MainConfigNames::DeleteRevisionsLimit => false,
];
$config = $overrideConfig + $baseConfig;
$specialPageFactory = $options['specialPageFactory'] ??
@@ -369,7 +370,7 @@ class PermissionManagerTest extends MediaWikiUnitTestCase {
// Overrides needed in case `groupHasPermission` is called
$config = [
- 'GroupPermissions' => [
+ MainConfigNames::GroupPermissions => [
'autoconfirmed' => [
'move' => true
]
diff --git a/tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php b/tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php
index 7d3463e5851b..56a80c5ab32f 100644
--- a/tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php
+++ b/tests/phpunit/unit/includes/Permissions/RestrictionStoreTest.php
@@ -6,6 +6,7 @@ use DatabaseTestHelper;
use LinkCache;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Linker\LinksMigration;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageIdentityValue;
use MediaWiki\Page\PageReferenceValue;
@@ -80,10 +81,10 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
private function newRestrictionStore( array $options = [] ): RestrictionStore {
return new RestrictionStore(
new ServiceOptions( RestrictionStore::CONSTRUCTOR_OPTIONS, $options + [
- 'NamespaceProtection' => [],
- 'RestrictionLevels' => [ '', 'autoconfirmed', 'sysop' ],
- 'RestrictionTypes' => self::DEFAULT_RESTRICTION_TYPES,
- 'SemiprotectedRestrictionLevels' => [ 'autoconfirmed' ],
+ MainConfigNames::NamespaceProtection => [],
+ MainConfigNames::RestrictionLevels => [ '', 'autoconfirmed', 'sysop' ],
+ MainConfigNames::RestrictionTypes => self::DEFAULT_RESTRICTION_TYPES,
+ MainConfigNames::SemiprotectedRestrictionLevels => [ 'autoconfirmed' ],
] ),
$this->createNoOpMock( WANObjectCache::class ),
$this->newMockLoadBalancer( $options['db'] ?? [] ),
@@ -259,7 +260,7 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
(object)[ 'pr_type' => 'move', 'pr_level' => 'sysop',
'pr_expiry' => 'infinity', 'pr_cascade' => 0 ],
],
- [ 'RestrictionTypes' => [ 'create', 'edit', 'upload' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create', 'edit', 'upload' ] ],
],
'Expired protection' => [
[ 'edit' => [], 'move' => [ 'sysop' ] ],
@@ -531,13 +532,13 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
false,
[ (object)[ 'pr_type' => 'edit', 'pr_level' => 'autoconfirmed',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ] ],
- [ 'SemiprotectedRestrictionLevels' => [] ],
+ [ MainConfigNames::SemiprotectedRestrictionLevels => [] ],
],
'Config with editsemiprotected' => [
true,
[ (object)[ 'pr_type' => 'edit', 'pr_level' => 'autoconfirmed',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ] ],
- [ 'SemiprotectedRestrictionLevels' => [ 'editsemiprotected' ] ],
+ [ MainConfigNames::SemiprotectedRestrictionLevels => [ 'editsemiprotected' ] ],
],
'Data with editsemiprotected' => [
true,
@@ -548,20 +549,20 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
true,
[ (object)[ 'pr_type' => 'edit', 'pr_level' => 'editsemiprotected',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ] ],
- [ 'SemiprotectedRestrictionLevels' => [ 'editsemiprotected' ] ],
+ [ MainConfigNames::SemiprotectedRestrictionLevels => [ 'editsemiprotected' ] ],
],
'Semiprotection plus other protection level' => [
false,
[ (object)[ 'pr_type' => 'edit', 'pr_level' => 'autoconfirmed,superman',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ] ],
- [ 'RestrictionLevels' => [ '', 'autoconfirmed', 'sysop', 'superman' ] ],
+ [ MainConfigNames::RestrictionLevels => [ '', 'autoconfirmed', 'sysop', 'superman' ] ],
],
'Two semiprotections' => [
true,
[ (object)[ 'pr_type' => 'edit', 'pr_level' => 'autoconfirmed,superman',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ] ],
- [ 'RestrictionLevels' => [ '', 'autoconfirmed', 'sysop', 'superman' ],
- 'SemiprotectedRestrictionLevels' => [ 'autoconfirmed', 'superman' ] ],
+ [ MainConfigNames::RestrictionLevels => [ '', 'autoconfirmed', 'sysop', 'superman' ],
+ MainConfigNames::SemiprotectedRestrictionLevels => [ 'autoconfirmed', 'superman' ] ],
],
];
}
@@ -631,7 +632,7 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
true,
[ (object)[ 'pr_type' => 'custom', 'pr_level' => 'sysop',
'pr_expiry' => 'infinity', 'pr_cascade' => '0' ], ],
- [ 'action' => 'custom', 'RestrictionTypes' =>
+ [ 'action' => 'custom', MainConfigNames::RestrictionTypes =>
array_merge( self::DEFAULT_RESTRICTION_TYPES, [ 'custom' ] ) ],
],
'Check custom protection level' => [
@@ -732,48 +733,48 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
'Nonexistent page with no create' => [
[],
PageIdentityValue::localIdentity( 0, NS_MAIN, 'X' ),
- [ 'RestrictionTypes' => [ 'edit', 'move', 'upload' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'edit', 'move', 'upload' ] ],
],
'Existing page with no move' => [
[ 'edit' ],
PageIdentityValue::localIdentity( 1, NS_MAIN, 'X' ),
- [ 'RestrictionTypes' => [ 'create', 'edit', 'upload' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create', 'edit', 'upload' ] ],
],
'Nonexistent file with no upload' => [
[ 'create' ],
PageIdentityValue::localIdentity( 0, NS_FILE, 'X' ),
- [ 'RestrictionTypes' => [ 'create', 'edit', 'move' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create', 'edit', 'move' ] ],
],
'Special page with extra type' => [
[],
self::newImproperPageIdentity( NS_SPECIAL, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Media page with extra type' => [
[],
self::newImproperPageIdentity( NS_MEDIA, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Nonexistent page with extra type' => [
[ 'create' ],
PageIdentityValue::localIdentity( 0, NS_MAIN, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Existing page with extra type' => [
[ 'edit', 'move', 'liquify' ],
PageIdentityValue::localIdentity( 1, NS_MAIN, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Nonexistent file with extra type' => [
[ 'create', 'upload' ],
PageIdentityValue::localIdentity( 0, NS_FILE, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Existing file with extra type' => [
[ 'edit', 'move', 'upload', 'liquify' ],
PageIdentityValue::localIdentity( 1, NS_FILE, 'X' ),
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Hook' => [
@@ -827,43 +828,43 @@ class RestrictionStoreTest extends MediaWikiUnitTestCase {
'Exists with extra restriction type' => [
[ 'edit', 'move', 'upload', 'solidify' ],
[ true ],
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Default is exists with extra restriction type' => [
[ 'edit', 'move', 'upload', 'solidify' ],
[],
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Nonexistent with extra restriction type' => [
[ 'create', 'upload' ],
[ false ],
- [ 'RestrictionTypes' => $expandedRestrictions ],
+ [ MainConfigNames::RestrictionTypes => $expandedRestrictions ],
],
'Exists with no edit' => [
[ 'move', 'upload' ],
[ true ],
- [ 'RestrictionTypes' => [ 'create', 'move', 'upload' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create', 'move', 'upload' ] ],
],
'Exists with only create' => [
[],
[ true ],
- [ 'RestrictionTypes' => [ 'create' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create' ] ],
],
'Nonexistent with no create' => [
[ 'upload' ],
[ false ],
- [ 'RestrictionTypes' => [ 'edit', 'move', 'upload', 'solidify' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'edit', 'move', 'upload', 'solidify' ] ],
],
'Nonexistent with no upload' => [
[ 'create' ],
[ false ],
- [ 'RestrictionTypes' => [ 'create', 'edit', 'move', 'solidify' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'create', 'edit', 'move', 'solidify' ] ],
],
'Nonexistent with no create or upload' => [
[],
[ false ],
- [ 'RestrictionTypes' => [ 'edit', 'move', 'solidify' ] ],
+ [ MainConfigNames::RestrictionTypes => [ 'edit', 'move', 'solidify' ] ],
],
];
}
diff --git a/tests/phpunit/unit/includes/PingbackTest.php b/tests/phpunit/unit/includes/PingbackTest.php
index 0af29ef0bf1f..a39877043202 100644
--- a/tests/phpunit/unit/includes/PingbackTest.php
+++ b/tests/phpunit/unit/includes/PingbackTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Http\HttpRequestFactory;
+use MediaWiki\MainConfigNames;
use Psr\Log\NullLogger;
use Wikimedia\Rdbms\DBConnRef;
use Wikimedia\Rdbms\ILoadBalancer;
@@ -32,7 +33,7 @@ class PingbackTest extends MediaWikiUnitTestCase {
$loadBalancer->method( 'getConnectionRef' )->willReturn( $database );
$pingback = new MockPingback(
- new HashConfig( [ 'Pingback' => $enablePingback ] ),
+ new HashConfig( [ MainConfigNames::Pingback => $enablePingback ] ),
$loadBalancer,
$cache ?? new HashBagOStuff(),
$httpRequestFactory,
diff --git a/tests/phpunit/unit/includes/Rest/CorsUtilsTest.php b/tests/phpunit/unit/includes/Rest/CorsUtilsTest.php
index 680d6cbb1147..2eba788ed0b7 100644
--- a/tests/phpunit/unit/includes/Rest/CorsUtilsTest.php
+++ b/tests/phpunit/unit/includes/Rest/CorsUtilsTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\Rest;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Rest\CorsUtils;
use MediaWiki\Rest\Handler;
use MediaWiki\Rest\RequestInterface;
@@ -18,12 +19,12 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
private function createServiceOptions( array $options = [] ) {
$defaults = [
- 'AllowedCorsHeaders' => [],
- 'AllowCrossOrigin' => false,
- 'RestAllowCrossOriginCookieAuth' => false,
- 'CanonicalServer' => 'https://example.com',
- 'CrossSiteAJAXdomains' => [],
- 'CrossSiteAJAXdomainExceptions' => [],
+ MainConfigNames::AllowedCorsHeaders => [],
+ MainConfigNames::AllowCrossOrigin => false,
+ MainConfigNames::RestAllowCrossOriginCookieAuth => false,
+ MainConfigNames::CanonicalServer => 'https://example.com',
+ MainConfigNames::CrossSiteAJAXdomains => [],
+ MainConfigNames::CrossSiteAJAXdomainExceptions => [],
];
return new ServiceOptions( CorsUtils::CONSTRUCTOR_OPTIONS, array_merge( $defaults, $options ) );
@@ -35,7 +36,7 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
public function testAuthorizeAllowOrigin( bool $isRegistered, bool $needsWriteAccess, string $origin ) {
$cors = new CorsUtils(
$this->createServiceOptions( [
- 'CrossSiteAJAXdomains' => [
+ MainConfigNames::CrossSiteAJAXdomains => [
'www.mediawiki.org',
],
] ),
@@ -147,7 +148,7 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
public function testModifyResponseAllowOrigin() {
$cors = new CorsUtils(
$this->createServiceOptions( [
- 'AllowCrossOrigin' => true,
+ MainConfigNames::AllowCrossOrigin => true,
] ),
$this->createNoOpMock( ResponseFactory::class ),
new UserIdentityValue( 0, __CLASS__ )
@@ -174,8 +175,8 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
public function testModifyResponseAllowTrustedOriginCookieAuth( string $requestMethod, bool $isRegistered ) {
$cors = new CorsUtils(
$this->createServiceOptions( [
- 'AllowCrossOrigin' => true,
- 'RestAllowCrossOriginCookieAuth' => true,
+ MainConfigNames::AllowCrossOrigin => true,
+ MainConfigNames::RestAllowCrossOriginCookieAuth => true,
] ),
$this->createNoOpMock( ResponseFactory::class ),
new UserIdentityValue( (int)$isRegistered, __CLASS__ )
@@ -229,8 +230,8 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
) {
$cors = new CorsUtils(
$this->createServiceOptions( [
- 'AllowCrossOrigin' => true,
- 'RestAllowCrossOriginCookieAuth' => true,
+ MainConfigNames::AllowCrossOrigin => true,
+ MainConfigNames::RestAllowCrossOriginCookieAuth => true,
] ),
$this->createNoOpMock( ResponseFactory::class ),
new UserIdentityValue( (int)$isRegistered, __CLASS__ )
@@ -307,7 +308,7 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
$cors = new CorsUtils(
$this->createServiceOptions( [
- 'AllowedCorsHeaders' => [ 'Authorization', 'BlaHeader', ],
+ MainConfigNames::AllowedCorsHeaders => [ 'Authorization', 'BlaHeader', ],
] ),
$responseFactory,
new UserIdentityValue( 0, __CLASS__ )
diff --git a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
index 6858e321ddb3..513f0ae853fb 100644
--- a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
+++ b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
@@ -6,6 +6,7 @@ use HashConfig;
use InvalidArgumentException;
use Language;
use MediaWiki\Linker\LinkTarget;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageIdentityValue;
use MediaWiki\Page\PageStore;
@@ -69,10 +70,10 @@ class SearchHandlerTest extends \MediaWikiUnitTestCase {
$mockTitleFormatter = null
) {
$config = new HashConfig( [
- 'SearchType' => 'test',
- 'SearchTypeAlternatives' => [],
- 'NamespacesToBeSearchedDefault' => [ NS_MAIN => true ],
- 'SearchSuggestCacheExpiry' => 1200,
+ MainConfigNames::SearchType => 'test',
+ MainConfigNames::SearchTypeAlternatives => [],
+ MainConfigNames::NamespacesToBeSearchedDefault => [ NS_MAIN => true ],
+ MainConfigNames::SearchSuggestCacheExpiry => 1200,
] );
/** @var Language|MockObject $language */
diff --git a/tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php b/tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php
index cbe8b2e2a564..5fe414d92537 100644
--- a/tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php
+++ b/tests/phpunit/unit/includes/Storage/BlobStoreFactoryTest.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Storage\Unit;
use ExternalStoreAccess;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Storage\BlobStore;
use MediaWiki\Storage\BlobStoreFactory;
use MediaWiki\Storage\SqlBlobStore;
@@ -22,10 +23,10 @@ class BlobStoreFactoryTest extends MediaWikiUnitTestCase {
$lbFactory = $this->createMock( ILBFactory::class );
$lbFactory->method( 'getMainLB' )->willReturn( $this->createMock( ILoadBalancer::class ) );
$options = [
- 'CompressRevisions' => false,
- 'DefaultExternalStore' => false,
- 'LegacyEncoding' => false,
- 'RevisionCacheExpiry' => 86400 * 7,
+ MainConfigNames::CompressRevisions => false,
+ MainConfigNames::DefaultExternalStore => false,
+ MainConfigNames::LegacyEncoding => false,
+ MainConfigNames::RevisionCacheExpiry => 86400 * 7,
];
return new BlobStoreFactory(
$lbFactory,
diff --git a/tests/phpunit/unit/includes/Storage/EditResultBuilderTest.php b/tests/phpunit/unit/includes/Storage/EditResultBuilderTest.php
index 4396a99b4012..0efec8ac6be0 100644
--- a/tests/phpunit/unit/includes/Storage/EditResultBuilderTest.php
+++ b/tests/phpunit/unit/includes/Storage/EditResultBuilderTest.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Storage;
use DummyContentForTesting;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\RevisionStore;
@@ -377,7 +378,7 @@ class EditResultBuilderTest extends MediaWikiUnitTestCase {
$options = new ServiceOptions(
EditResultBuilder::CONSTRUCTOR_OPTIONS,
- [ 'ManualRevertSearchRadius' => $manualRevertSearchRadius ]
+ [ MainConfigNames::ManualRevertSearchRadius => $manualRevertSearchRadius ]
);
return new EditResultBuilder(
diff --git a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
index 3a30c0681fde..0f8726223fef 100644
--- a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
+++ b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php
@@ -5,6 +5,7 @@ namespace MediaWiki\Tests\Storage;
use BagOStuff;
use FormatJson;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Storage\EditResult;
use MediaWiki\Storage\EditResultCache;
use MediaWikiUnitTestCase;
@@ -59,7 +60,7 @@ class EditResultCacheTest extends MediaWikiUnitTestCase {
$this->createNoOpMock( ILoadBalancer::class ),
new ServiceOptions(
EditResultCache::CONSTRUCTOR_OPTIONS,
- [ 'RCMaxAge' => BagOStuff::TTL_MONTH ]
+ [ MainConfigNames::RCMaxAge => BagOStuff::TTL_MONTH ]
)
);
@@ -87,7 +88,7 @@ class EditResultCacheTest extends MediaWikiUnitTestCase {
$this->createNoOpMock( ILoadBalancer::class ),
new ServiceOptions(
EditResultCache::CONSTRUCTOR_OPTIONS,
- [ 'RCMaxAge' => BagOStuff::TTL_MONTH ]
+ [ MainConfigNames::RCMaxAge => BagOStuff::TTL_MONTH ]
)
);
$res = $erCache->get( 126 );
@@ -124,7 +125,7 @@ class EditResultCacheTest extends MediaWikiUnitTestCase {
$loadBalancer,
new ServiceOptions(
EditResultCache::CONSTRUCTOR_OPTIONS,
- [ 'RCMaxAge' => BagOStuff::TTL_MONTH ]
+ [ MainConfigNames::RCMaxAge => BagOStuff::TTL_MONTH ]
)
);
$res = $erCache->get( 126 );
@@ -159,7 +160,7 @@ class EditResultCacheTest extends MediaWikiUnitTestCase {
$loadBalancer,
new ServiceOptions(
EditResultCache::CONSTRUCTOR_OPTIONS,
- [ 'RCMaxAge' => BagOStuff::TTL_MONTH ]
+ [ MainConfigNames::RCMaxAge => BagOStuff::TTL_MONTH ]
)
);
$res = $erCache->get( 126 );
diff --git a/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php b/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
index 014611a74de8..3c82189677d2 100644
--- a/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
+++ b/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\Unit\Storage;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\WikiPageFactory;
use MediaWiki\Storage\DerivedPageDataUpdater;
use MediaWiki\Storage\PageUpdater;
@@ -22,13 +23,13 @@ class PageUpdaterFactoryTest extends MediaWikiUnitTestCase {
private function getPageUpdaterFactory() {
$config = [
- 'ArticleCountMethod' => null,
- 'RCWatchCategoryMembership' => null,
- 'PageCreationLog' => null,
- 'UseAutomaticEditSummaries' => null,
- 'ManualRevertSearchRadius' => null,
- 'UseRCPatrol' => null,
- 'ParsoidCacheConfig' => [
+ MainConfigNames::ArticleCountMethod => null,
+ MainConfigNames::RCWatchCategoryMembership => null,
+ MainConfigNames::PageCreationLog => null,
+ MainConfigNames::UseAutomaticEditSummaries => null,
+ MainConfigNames::ManualRevertSearchRadius => null,
+ MainConfigNames::UseRCPatrol => null,
+ MainConfigNames::ParsoidCacheConfig => [
'WarmParsoidParserCache' => false
],
];
diff --git a/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php b/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php
index a5b75a4fa82d..f60481694d88 100644
--- a/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php
+++ b/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\Storage;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\RevisionStore;
@@ -76,7 +77,7 @@ class RevertedTagUpdateTest extends MediaWikiUnitTestCase {
) {
$serviceOptions = new ServiceOptions(
RevertedTagUpdate::CONSTRUCTOR_OPTIONS,
- [ 'RevertedTagMaxDepth' => $revertedTagMaxDepth ]
+ [ MainConfigNames::RevertedTagMaxDepth => $revertedTagMaxDepth ]
);
parent::__construct(
diff --git a/tests/phpunit/unit/includes/block/BlockPermissionCheckerTest.php b/tests/phpunit/unit/includes/block/BlockPermissionCheckerTest.php
index d8dd98b5f823..08b1e859121e 100644
--- a/tests/phpunit/unit/includes/block/BlockPermissionCheckerTest.php
+++ b/tests/phpunit/unit/includes/block/BlockPermissionCheckerTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Block\BlockPermissionChecker;
use MediaWiki\Block\BlockUtils;
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\Authority;
use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
use MediaWiki\User\UserIdentity;
@@ -32,7 +33,7 @@ class BlockPermissionCheckerTest extends MediaWikiUnitTestCase {
) {
$options = new ServiceOptions(
BlockPermissionChecker::CONSTRUCTOR_OPTIONS,
- [ 'EnableUserEmail' => $enableUserEmail ]
+ [ MainConfigNames::EnableUserEmail => $enableUserEmail ]
);
// We don't care about how BlockUtils::parseBlockTarget actually works, just
diff --git a/tests/phpunit/unit/includes/block/BlockUtilsTest.php b/tests/phpunit/unit/includes/block/BlockUtilsTest.php
index 7e2554f4d94f..8456960f948c 100644
--- a/tests/phpunit/unit/includes/block/BlockUtilsTest.php
+++ b/tests/phpunit/unit/includes/block/BlockUtilsTest.php
@@ -3,6 +3,7 @@
use MediaWiki\Block\AbstractBlock;
use MediaWiki\Block\BlockUtils;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Tests\Unit\DummyServicesTrait;
use MediaWiki\User\UserIdentity;
use MediaWiki\User\UserIdentityLookup;
@@ -28,7 +29,7 @@ class BlockUtilsTest extends MediaWikiUnitTestCase {
UserIdentityLookup $userIdentityLookup = null
) {
$baseOptions = [
- 'BlockCIDRLimit' => [
+ MainConfigNames::BlockCIDRLimit => [
'IPv4' => 16,
'IPv6' => 19
]
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
index b0e258a01893..0cc2ee135a2a 100644
--- a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
+++ b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
@@ -29,6 +29,7 @@ use MediaWiki\EditPage\Constraint\UserBlockConstraint;
use MediaWiki\EditPage\SpamChecker;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\Logger\Spi;
+use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\PermissionManager;
use Psr\Log\NullLogger;
@@ -44,7 +45,7 @@ class EditConstraintFactoryTest extends MediaWikiUnitTestCase {
public function testFactoryMethods() {
$options = new ServiceOptions(
EditConstraintFactory::CONSTRUCTOR_OPTIONS,
- [ 'MaxArticleSize' => 10 ]
+ [ MainConfigNames::MaxArticleSize => 10 ]
);
$loggerFactory = $this->createMock( Spi::class );
$loggerFactory->method( 'getLogger' )
diff --git a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
index a0c822f63e1a..f0f4bf881183 100644
--- a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
+++ b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
@@ -3,6 +3,7 @@
use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MainConfigNames;
use Wikimedia\TestingAccessWrapper;
/**
@@ -71,10 +72,10 @@ trait FileBackendGroupTestTrait {
private static function getDefaultOptions() {
return [
- 'DirectoryMode' => 0775,
- 'FileBackends' => [],
- 'ForeignFileRepos' => [],
- 'LocalFileRepo' => self::getDefaultLocalFileRepo(),
+ MainConfigNames::DirectoryMode => 0775,
+ MainConfigNames::FileBackends => [],
+ MainConfigNames::ForeignFileRepos => [],
+ MainConfigNames::LocalFileRepo => self::getDefaultLocalFileRepo(),
'fallbackWikiId' => self::getWikiID(),
];
}
@@ -83,7 +84,7 @@ trait FileBackendGroupTestTrait {
* @covers ::__construct
*/
public function testConstructor_overrideImplicitBackend() {
- $obj = $this->newObj( [ 'FileBackends' =>
+ $obj = $this->newObj( [ MainConfigNames::FileBackends =>
[ [ 'name' => 'local-backend', 'class' => '', 'lockManager' => 'fsLockManager' ] ]
] );
$this->assertSame( '', $obj->config( 'local-backend' )['class'] );
@@ -95,7 +96,7 @@ trait FileBackendGroupTestTrait {
public function testConstructor_backendObject() {
// 'backend' being an object makes that repo from configuration ignored
// XXX This is not documented in MainConfigSchema, does it do anything useful?
- $obj = $this->newObj( [ 'ForeignFileRepos' => [ [ 'backend' => (object)[] ] ] ] );
+ $obj = $this->newObj( [ MainConfigNames::ForeignFileRepos => [ [ 'backend' => (object)[] ] ] ] );
$this->assertSame( FSFileBackend::class, $obj->config( 'local-backend' )['class'] );
}
@@ -119,7 +120,7 @@ trait FileBackendGroupTestTrait {
$otherExtraOptions['lmgFactory'] = $this->getLockManagerGroupFactory( $expected );
}
$obj = $this->newObj( $otherExtraOptions + [
- 'FileBackends' => [
+ MainConfigNames::FileBackends => [
$extraBackendsOptions + [
'name' => 'myname', 'class' => '', 'lockManager' => 'fsLockManager'
]
@@ -169,7 +170,7 @@ trait FileBackendGroupTestTrait {
public function testRegister_exception( $fileBackends, $class, $msg ) {
$this->expectException( $class );
$this->expectExceptionMessage( $msg );
- $this->newObj( [ 'FileBackends' => $fileBackends ] );
+ $this->newObj( [ MainConfigNames::FileBackends => $fileBackends ] );
}
public static function provideRegister_exception() {
@@ -278,7 +279,7 @@ trait FileBackendGroupTestTrait {
$config = self::getDefaultLocalFileRepo();
$config[$inputName] = null;
- $result = $this->newObj( [ 'LocalFileRepo' => $config ] )->config( 'local-backend' );
+ $result = $this->newObj( [ MainConfigNames::LocalFileRepo => $config ] )->config( 'local-backend' );
$actual = is_string( $key ) ? $result[$key] : $result[$key[0]][$key[1]];
@@ -298,7 +299,7 @@ trait FileBackendGroupTestTrait {
$config = self::getDefaultLocalFileRepo();
unset( $config[$inputName] );
- $result = $this->newObj( [ 'LocalFileRepo' => $config ] )->config( 'local-backend' );
+ $result = $this->newObj( [ MainConfigNames::LocalFileRepo => $config ] )->config( 'local-backend' );
$actual = is_string( $key ) ? $result[$key] : $result[$key[0]][$key[1]];
@@ -332,7 +333,7 @@ trait FileBackendGroupTestTrait {
* @param string $storagePath
*/
public function testBackendFromPath( $expected, $storagePath ) {
- $obj = $this->newObj( [ 'FileBackends' => [
+ $obj = $this->newObj( [ MainConfigNames::FileBackends => [
[ 'name' => '', 'class' => stdClass::class, 'lockManager' => 'fsLockManager' ],
[ 'name' => 'a', 'class' => stdClass::class, 'lockManager' => 'fsLockManager' ],
[ 'name' => 'b', 'class' => stdClass::class, 'lockManager' => 'fsLockManager' ],
diff --git a/tests/phpunit/unit/includes/http/HttpRequestFactoryTest.php b/tests/phpunit/unit/includes/http/HttpRequestFactoryTest.php
index 969175360937..ee9d0baf1841 100644
--- a/tests/phpunit/unit/includes/http/HttpRequestFactoryTest.php
+++ b/tests/phpunit/unit/includes/http/HttpRequestFactoryTest.php
@@ -2,6 +2,7 @@
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Http\HttpRequestFactory;
+use MediaWiki\MainConfigNames;
use Psr\Log\NullLogger;
use Wikimedia\TestingAccessWrapper;
@@ -17,15 +18,15 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
private function newFactory( $options = null ) {
if ( !$options ) {
$options = [
- 'HTTPTimeout' => 1,
- 'HTTPConnectTimeout' => 1,
- 'HTTPMaxTimeout' => INF,
- 'HTTPMaxConnectTimeout' => INF
+ MainConfigNames::HTTPTimeout => 1,
+ MainConfigNames::HTTPConnectTimeout => 1,
+ MainConfigNames::HTTPMaxTimeout => INF,
+ MainConfigNames::HTTPMaxConnectTimeout => INF
];
}
$options += [
- 'LocalVirtualHosts' => [],
- 'LocalHTTPProxy' => false,
+ MainConfigNames::LocalVirtualHosts => [],
+ MainConfigNames::LocalHTTPProxy => false,
];
return new HttpRequestFactory(
new ServiceOptions( HttpRequestFactory::CONSTRUCTOR_OPTIONS, $options ),
@@ -148,10 +149,10 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
return [
'normal config defaults' => [
[
- 'HTTPTimeout' => 10,
- 'HTTPConnectTimeout' => 20,
- 'HTTPMaxTimeout' => INF,
- 'HTTPMaxConnectTimeout' => INF
+ MainConfigNames::HTTPTimeout => 10,
+ MainConfigNames::HTTPConnectTimeout => 20,
+ MainConfigNames::HTTPMaxTimeout => INF,
+ MainConfigNames::HTTPMaxConnectTimeout => INF
],
[],
[
@@ -161,10 +162,10 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
],
'config defaults overridden by max' => [
[
- 'HTTPTimeout' => 10,
- 'HTTPConnectTimeout' => 20,
- 'HTTPMaxTimeout' => 9,
- 'HTTPMaxConnectTimeout' => 11
+ MainConfigNames::HTTPTimeout => 10,
+ MainConfigNames::HTTPConnectTimeout => 20,
+ MainConfigNames::HTTPMaxTimeout => 9,
+ MainConfigNames::HTTPMaxConnectTimeout => 11
],
[],
[
@@ -174,10 +175,10 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
],
'create option overridden by max config' => [
[
- 'HTTPTimeout' => 1,
- 'HTTPConnectTimeout' => 2,
- 'HTTPMaxTimeout' => 9,
- 'HTTPMaxConnectTimeout' => 11
+ MainConfigNames::HTTPTimeout => 1,
+ MainConfigNames::HTTPConnectTimeout => 2,
+ MainConfigNames::HTTPMaxTimeout => 9,
+ MainConfigNames::HTTPMaxConnectTimeout => 11
],
[
'timeout' => 100,
@@ -190,10 +191,10 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
],
'create option below max config' => [
[
- 'HTTPTimeout' => 1,
- 'HTTPConnectTimeout' => 2,
- 'HTTPMaxTimeout' => 9,
- 'HTTPMaxConnectTimeout' => 11
+ MainConfigNames::HTTPTimeout => 1,
+ MainConfigNames::HTTPConnectTimeout => 2,
+ MainConfigNames::HTTPMaxTimeout => 9,
+ MainConfigNames::HTTPMaxConnectTimeout => 11
],
[
'timeout' => 7,
@@ -206,10 +207,10 @@ class HttpRequestFactoryTest extends MediaWikiUnitTestCase {
],
'max config overridden by max create option ' => [
[
- 'HTTPTimeout' => 1,
- 'HTTPConnectTimeout' => 2,
- 'HTTPMaxTimeout' => 9,
- 'HTTPMaxConnectTimeout' => 11
+ MainConfigNames::HTTPTimeout => 1,
+ MainConfigNames::HTTPConnectTimeout => 2,
+ MainConfigNames::HTTPMaxTimeout => 9,
+ MainConfigNames::HTTPMaxConnectTimeout => 11
],
[
'timeout' => 100,
diff --git a/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php b/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
index cc94abad3ebf..a573c8f509b4 100644
--- a/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
+++ b/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
@@ -2,6 +2,7 @@
use MediaWiki\Config\ServiceOptions;
use MediaWiki\JobQueue\JobQueueGroupFactory;
+use MediaWiki\MainConfigNames;
use Wikimedia\UUID\GlobalIdGenerator;
/**
@@ -13,10 +14,10 @@ class JobQueueGroupFactoryTest extends MediaWikiUnitTestCase {
new ServiceOptions(
JobQueueGroupFactory::CONSTRUCTOR_OPTIONS,
new HashConfig( [
- 'LocalDatabases' => [],
- 'JobClasses' => [],
- 'JobTypeConf' => [],
- 'JobTypesExcludedFromDefaultQueue' => []
+ MainConfigNames::LocalDatabases => [],
+ MainConfigNames::JobClasses => [],
+ MainConfigNames::JobTypeConf => [],
+ MainConfigNames::JobTypesExcludedFromDefaultQueue => []
] )
),
$this->createMock( ConfiguredReadOnlyMode::class ),
diff --git a/tests/phpunit/unit/includes/language/LanguageNameUtilsTest.php b/tests/phpunit/unit/includes/language/LanguageNameUtilsTest.php
index 273b6d0bc6f5..5c82176ae8da 100644
--- a/tests/phpunit/unit/includes/language/LanguageNameUtilsTest.php
+++ b/tests/phpunit/unit/includes/language/LanguageNameUtilsTest.php
@@ -3,6 +3,7 @@
use MediaWiki\Config\ServiceOptions;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\MainConfigNames;
class LanguageNameUtilsTest extends MediaWikiUnitTestCase {
use LanguageNameUtilsTestTrait;
@@ -27,9 +28,9 @@ class LanguageNameUtilsTest extends MediaWikiUnitTestCase {
LanguageNameUtils::CONSTRUCTOR_OPTIONS,
$optionsArray,
[
- 'ExtraLanguageNames' => [],
- 'LanguageCode' => 'en',
- 'UsePigLatinVariant' => false,
+ MainConfigNames::ExtraLanguageNames => [],
+ MainConfigNames::LanguageCode => 'en',
+ MainConfigNames::UsePigLatinVariant => false,
]
),
$this->hookContainer
diff --git a/tests/phpunit/unit/includes/language/LanguageNameUtilsTestTrait.php b/tests/phpunit/unit/includes/language/LanguageNameUtilsTestTrait.php
index 1a1d4433a528..ddbcd0cb7eed 100644
--- a/tests/phpunit/unit/includes/language/LanguageNameUtilsTestTrait.php
+++ b/tests/phpunit/unit/includes/language/LanguageNameUtilsTestTrait.php
@@ -3,6 +3,7 @@
// phpcs:disable MediaWiki.Commenting.FunctionComment.MissingParamTag -- Traits are not excluded
use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\MainConfigNames;
const AUTONYMS = LanguageNameUtils::AUTONYMS;
const ALL = LanguageNameUtils::ALL;
@@ -267,7 +268,7 @@ trait LanguageNameUtilsTestTrait {
}
);
$this->assertGetLanguageNames(
- [ 'ExtraLanguageNames' => [ 'de' => 'deutsche Sprache', 'sqsqsqsq' => '!!?!' ] ],
+ [ MainConfigNames::ExtraLanguageNames => [ 'de' => 'deutsche Sprache', 'sqsqsqsq' => '!!?!' ] ],
$expected, $code, ...$otherArgs
);
}
@@ -381,7 +382,7 @@ trait LanguageNameUtilsTestTrait {
);
$this->assertGetLanguageNames(
- [ 'UsePigLatinVariant' => true ], $expected, 'en-x-piglatin', ...$otherArgs );
+ [ MainConfigNames::UsePigLatinVariant => true ], $expected, 'en-x-piglatin', ...$otherArgs );
}
public function provideGetLanguageNames_pigLatin() {
@@ -408,8 +409,8 @@ trait LanguageNameUtilsTestTrait {
public function testGetLanguageNames_pigLatinAndExtraLanguageNames() {
$this->assertGetLanguageNames(
[
- 'UsePigLatinVariant' => true,
- 'ExtraLanguageNames' => [ 'en-x-piglatin' => 'igpay atinlay' ]
+ MainConfigNames::UsePigLatinVariant => true,
+ MainConfigNames::ExtraLanguageNames => [ 'en-x-piglatin' => 'igpay atinlay' ]
],
'Igpay Atinlay',
'en-x-piglatin'
diff --git a/tests/phpunit/unit/includes/page/DeletePageTest.php b/tests/phpunit/unit/includes/page/DeletePageTest.php
index a370a4f8b342..d19d328a912d 100644
--- a/tests/phpunit/unit/includes/page/DeletePageTest.php
+++ b/tests/phpunit/unit/includes/page/DeletePageTest.php
@@ -10,6 +10,7 @@ use JobQueueGroup;
use MediaWiki\Cache\BacklinkCacheFactory;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Linker\LinkTarget;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\DeletePage;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageIdentityValue;
@@ -69,8 +70,8 @@ class DeletePageTest extends MediaWikiUnitTestCase {
return new ServiceOptions(
DeletePage::CONSTRUCTOR_OPTIONS,
[
- 'DeleteRevisionsBatchSize' => 100,
- 'DeleteRevisionsLimit' => $deleteLimit
+ MainConfigNames::DeleteRevisionsBatchSize => 100,
+ MainConfigNames::DeleteRevisionsLimit => $deleteLimit
]
);
}
diff --git a/tests/phpunit/unit/includes/page/PageCommandFactoryTest.php b/tests/phpunit/unit/includes/page/PageCommandFactoryTest.php
index 17b39e934336..c98114d804f4 100644
--- a/tests/phpunit/unit/includes/page/PageCommandFactoryTest.php
+++ b/tests/phpunit/unit/includes/page/PageCommandFactoryTest.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Unit\Page;
use ContentModelChange;
use HashConfig;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\DeletePage;
use MediaWiki\Page\PageCommandFactory;
use MediaWiki\Page\PageIdentity;
@@ -31,16 +32,16 @@ class PageCommandFactoryTest extends MediaWikiUnitTestCase {
// Create a PageCommandFactory with all of the services needed
$config = new HashConfig( [
// RollbackPage
- 'UseRCPatrol' => true,
- 'DisableAnonTalk' => false,
+ MainConfigNames::UseRCPatrol => true,
+ MainConfigNames::DisableAnonTalk => false,
// MovePage
- 'CategoryCollation' => 'uppercase',
- 'MaximumMovedPages' => 100,
+ MainConfigNames::CategoryCollation => 'uppercase',
+ MainConfigNames::MaximumMovedPages => 100,
// DeletePage
- 'DeleteRevisionsBatchSize' => 10,
- 'DeleteRevisionsLimit' => 10,
+ MainConfigNames::DeleteRevisionsBatchSize => 10,
+ MainConfigNames::DeleteRevisionsLimit => 10,
] );
// Helper method from MockServiceDependenciesTrait
diff --git a/tests/phpunit/unit/includes/page/PageStoreFactoryTest.php b/tests/phpunit/unit/includes/page/PageStoreFactoryTest.php
index 050ef697c91e..118edc0d2e3d 100644
--- a/tests/phpunit/unit/includes/page/PageStoreFactoryTest.php
+++ b/tests/phpunit/unit/includes/page/PageStoreFactoryTest.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Page;
use LinkCache;
use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\PageStore;
use MediaWiki\Page\PageStoreFactory;
use MediaWikiUnitTestCase;
@@ -19,8 +20,8 @@ class PageStoreFactoryTest extends MediaWikiUnitTestCase {
public function testGetPageStore() {
$options = new ServiceOptions( PageStoreFactory::CONSTRUCTOR_OPTIONS, [
- 'LanguageCode' => 'fi',
- 'PageLanguageUseDB' => true,
+ MainConfigNames::LanguageCode => 'fi',
+ MainConfigNames::PageLanguageUseDB => true,
] );
$lb = $this->createNoOpMock( LoadBalancer::class );
diff --git a/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php b/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
index b1e10c0e3960..39512b7022ce 100644
--- a/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
+++ b/tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php
@@ -2,6 +2,7 @@
use MediaWiki\Config\ServiceOptions;
use MediaWiki\Json\JsonCodec;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\WikiPageFactory;
use MediaWiki\Parser\ParserCacheFactory;
use MediaWiki\Parser\RevisionOutputCache;
@@ -17,8 +18,8 @@ class ParserCacheFactoryTest extends MediaWikiUnitTestCase {
*/
private function newParserCacheFactory() {
$options = new ServiceOptions( ParserCacheFactory::CONSTRUCTOR_OPTIONS, [
- 'CacheEpoch' => '20200202112233',
- 'OldRevisionParserCacheExpireTime' => 60,
+ MainConfigNames::CacheEpoch => '20200202112233',
+ MainConfigNames::OldRevisionParserCacheExpireTime => 60,
] );
return new ParserCacheFactory(
diff --git a/tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php b/tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php
index f5aafb4a9a19..bbb721fd2783 100644
--- a/tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php
+++ b/tests/phpunit/unit/includes/parser/Parsoid/Config/SiteConfigTest.php
@@ -13,6 +13,7 @@ use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Languages\LanguageFactory;
use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\MainConfigNames;
use MediaWiki\Parser\Parsoid\Config\SiteConfig;
use MediaWiki\SpecialPage\SpecialPageFactory;
use MediaWiki\User\UserOptionsLookup;
@@ -33,29 +34,29 @@ use ZhConverter;
class SiteConfigTest extends MediaWikiUnitTestCase {
private const DEFAULT_CONFIG = [
- 'GalleryOptions' => [],
- 'AllowExternalImages' => false,
- 'AllowExternalImagesFrom' => '',
- 'Server' => 'localhost',
- 'ArticlePath' => false,
- 'InterwikiMagic' => true,
- 'ExtraInterlanguageLinkPrefixes' => [],
- 'LocalInterwikis' => [],
- 'LanguageCode' => 'qqq',
- 'DisableLangConversion' => false,
- 'NamespaceAliases' => [],
- 'UrlProtocols' => [ 'http://' ],
- 'Script' => false,
- 'ScriptPath' => '/wiki',
- 'LoadScript' => false,
- 'LocalTZoffset' => null,
- 'ThumbLimits' => [ 4242 ],
- 'MaxTemplateDepth' => 42,
- 'LegalTitleChars' => 'abc',
- 'NoFollowLinks' => true,
- 'NoFollowNsExceptions' => [ 5 ],
- 'NoFollowDomainExceptions' => [ 'www.mediawiki.org' ],
- 'ExternalLinkTarget' => false,
+ MainConfigNames::GalleryOptions => [],
+ MainConfigNames::AllowExternalImages => false,
+ MainConfigNames::AllowExternalImagesFrom => '',
+ MainConfigNames::Server => 'localhost',
+ MainConfigNames::ArticlePath => false,
+ MainConfigNames::InterwikiMagic => true,
+ MainConfigNames::ExtraInterlanguageLinkPrefixes => [],
+ MainConfigNames::LocalInterwikis => [],
+ MainConfigNames::LanguageCode => 'qqq',
+ MainConfigNames::DisableLangConversion => false,
+ MainConfigNames::NamespaceAliases => [],
+ MainConfigNames::UrlProtocols => [ 'http://' ],
+ MainConfigNames::Script => false,
+ MainConfigNames::ScriptPath => '/wiki',
+ MainConfigNames::LoadScript => false,
+ MainConfigNames::LocalTZoffset => null,
+ MainConfigNames::ThumbLimits => [ 4242 ],
+ MainConfigNames::MaxTemplateDepth => 42,
+ MainConfigNames::LegalTitleChars => 'abc',
+ MainConfigNames::NoFollowLinks => true,
+ MainConfigNames::NoFollowNsExceptions => [ 5 ],
+ MainConfigNames::NoFollowDomainExceptions => [ 'www.mediawiki.org' ],
+ MainConfigNames::ExternalLinkTarget => false,
];
private function createMockOrOverride( string $class, array $overrides ) {
@@ -105,30 +106,30 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
public function provideConfigParameterPassed(): iterable {
yield 'galleryOptions' => [
- [ 'GalleryOptions' => [ 'blabla' ] ],
+ [ MainConfigNames::GalleryOptions => [ 'blabla' ] ],
'galleryOptions',
[ 'blabla' ]
];
yield 'allowedExternalImagePrefixes, false' => [
- [ 'AllowExternalImages' => true ],
+ [ MainConfigNames::AllowExternalImages => true ],
'allowedExternalImagePrefixes',
[ '' ]
];
yield 'allowedExternalImagePrefixes, true' => [
[
- 'AllowExternalImages' => false,
- 'AllowExternalImagesFrom' => [ 'blabla' ]
+ MainConfigNames::AllowExternalImages => false,
+ MainConfigNames::AllowExternalImagesFrom => [ 'blabla' ]
],
'allowedExternalImagePrefixes',
[ 'blabla' ]
];
yield 'interwikiMagic' => [
- [ 'InterwikiMagic' => true ],
+ [ MainConfigNames::InterwikiMagic => true ],
'interwikiMagic',
true
];
yield 'lang' => [
- [ 'LanguageCode' => 'qqx' ],
+ [ MainConfigNames::LanguageCode => 'qqx' ],
'lang',
'qqx'
];
@@ -145,39 +146,39 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
[ 'enabled' => true, 'threshold' => 10 ]
];
yield 'script' => [
- [ 'Script' => 'blabla' ],
+ [ MainConfigNames::Script => 'blabla' ],
'script',
'blabla'
];
yield 'scriptpath' => [
- [ 'ScriptPath' => 'blabla' ],
+ [ MainConfigNames::ScriptPath => 'blabla' ],
'scriptpath',
'blabla'
];
yield 'server' => [
- [ 'Server' => 'blabla' ],
+ [ MainConfigNames::Server => 'blabla' ],
'server',
'blabla'
];
yield 'timezoneOffset' => [
- [ 'LocalTZoffset' => 42 ],
+ [ MainConfigNames::LocalTZoffset => 42 ],
'timezoneOffset',
42
];
yield 'getMaxTemplateDepth' => [
- [ 'MaxTemplateDepth' => 42 ],
+ [ MainConfigNames::MaxTemplateDepth => 42 ],
'getMaxTemplateDepth',
42
];
/* $wgLegalTitleChars can't be tested with this mechanism.
yield 'legalTitleChars' => [
- [ 'LegalTitleChars' => 'blabla' ],
+ [ MainConfigNames::LegalTitleChars => 'blabla' ],
'legalTitleChars',
'blabla'
];
*/
yield 'getProtocols' => [
- [ 'UrlProtocols' => [ 'blabla' ] ],
+ [ MainConfigNames::UrlProtocols => [ 'blabla' ] ],
'getProtocols',
[ 'blabla' ]
];
@@ -192,7 +193,7 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
false
];
yield 'getExternalLinkTargetString' => [
- [ 'ExternalLinkTarget' => "_blank" ],
+ [ MainConfigNames::ExternalLinkTarget => "_blank" ],
'getExternalLinkTarget',
"_blank"
];
@@ -364,7 +365,7 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
public function testArticlePath_exception( string $articlePath ) {
$this->expectException( UnexpectedValueException::class );
$config = $this->createSiteConfig( [
- 'ArticlePath' => $articlePath
+ MainConfigNames::ArticlePath => $articlePath
] );
$config->baseURI();
}
@@ -376,8 +377,8 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
*/
public function testArticlePath_nopath() {
$config = $this->createSiteConfig( [
- 'ArticlePath' => '$1',
- 'Server' => 'https://localhost'
+ MainConfigNames::ArticlePath => '$1',
+ MainConfigNames::Server => 'https://localhost'
] );
$this->assertSame( 'https://localhost/', $config->baseURI() );
$this->assertSame( './', $config->relativeLinkPrefix() );
@@ -390,8 +391,8 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
*/
public function testArticlePath() {
$config = $this->createSiteConfig( [
- 'ArticlePath' => '/wiki/$1',
- 'Server' => 'https://localhost'
+ MainConfigNames::ArticlePath => '/wiki/$1',
+ MainConfigNames::Server => 'https://localhost'
] );
$this->assertSame( './', $config->relativeLinkPrefix() );
$this->assertSame( 'https://localhost/wiki/', $config->baseURI() );
@@ -501,8 +502,8 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
->willReturn( false );
$config = $this->createSiteConfig( [
- 'ExtraInterlanguageLinkPrefixes' => [ 'ru' ],
- 'LocalInterwikis' => [ 'ru' ],
+ MainConfigNames::ExtraInterlanguageLinkPrefixes => [ 'ru' ],
+ MainConfigNames::LocalInterwikis => [ 'ru' ],
], [], [
InterwikiLookup::class => $interwikiMock,
LanguageNameUtils::class => $langNameUtilsMock,
@@ -714,7 +715,7 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
->with( 'thumbsize' )
->willReturn( 'small' );
$config = $this->createSiteConfig( [
- 'ThumbLimits' => [ 'small' => 42 ]
+ MainConfigNames::ThumbLimits => [ 'small' => 42 ]
], [], [
UserOptionsLookup::class => $optionsLookupMock
] );
@@ -777,7 +778,7 @@ class SiteConfigTest extends MediaWikiUnitTestCase {
'Whatever' => NS_MAIN
] );
$config = $this->createSiteConfig( [
- 'NamespaceAliases' => [
+ MainConfigNames::NamespaceAliases => [
'From Config' => NS_SPECIAL,
'Whatever' => NS_MAIN
]
diff --git a/tests/phpunit/unit/includes/password/PasswordFactoryTest.php b/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
index a5db1aed8c50..6c5ecdfb4e07 100644
--- a/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
+++ b/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MainConfigNames;
+
/**
* @covers PasswordFactory
*/
@@ -44,10 +46,10 @@ class PasswordFactoryTest extends MediaWikiUnitTestCase {
public function testInit() {
$config = new HashConfig( [
- 'PasswordConfig' => [
+ MainConfigNames::PasswordConfig => [
'foo' => [ 'class' => InvalidPassword::class ],
],
- 'PasswordDefault' => 'foo'
+ MainConfigNames::PasswordDefault => 'foo'
] );
$pf = new PasswordFactory;
$pf->init( $config );
diff --git a/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php b/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
index ba70281d8e56..105270d586cc 100644
--- a/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
+++ b/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
@@ -1,4 +1,5 @@
<?php
+use MediaWiki\MainConfigNames;
use MediaWiki\Skin\SkinComponentSearch;
/**
@@ -15,9 +16,9 @@ class SkinComponentSearchTest extends MediaWikiUnitTestCase {
*/
public function testGetTemplateData() {
$config = new HashConfig( [
- 'Script' => '/w/index.php',
- 'CapitalLinks' => true,
- 'WatchlistExpiry' => false,
+ MainConfigNames::Script => '/w/index.php',
+ MainConfigNames::CapitalLinks => true,
+ MainConfigNames::WatchlistExpiry => false,
] );
$user = new User();
$msg = $this->createMock( Message::class );
diff --git a/tests/phpunit/unit/includes/tidy/RemexDriverTest.php b/tests/phpunit/unit/includes/tidy/RemexDriverTest.php
index da142f2fa087..8e62ba99dbcb 100644
--- a/tests/phpunit/unit/includes/tidy/RemexDriverTest.php
+++ b/tests/phpunit/unit/includes/tidy/RemexDriverTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
class RemexDriverTest extends MediaWikiUnitTestCase {
private static $remexTidyTestData = [
@@ -353,7 +354,7 @@ MathML;
$r = new MediaWiki\Tidy\RemexDriver(
new ServiceOptions(
MediaWiki\Tidy\RemexDriver::CONSTRUCTOR_OPTIONS,
- new HashConfig( [ 'TidyConfig' => [] ] )
+ new HashConfig( [ MainConfigNames::TidyConfig => [] ] )
)
);
$result = $r->tidy( $input );
@@ -382,7 +383,7 @@ MathML;
$r = new MediaWiki\Tidy\RemexDriver(
new ServiceOptions(
MediaWiki\Tidy\RemexDriver::CONSTRUCTOR_OPTIONS,
- new HashConfig( [ 'TidyConfig' => [] ] )
+ new HashConfig( [ MainConfigNames::TidyConfig => [] ] )
)
);
$result = $r->tidy( $input );
diff --git a/tests/phpunit/unit/includes/user/ActorStoreFactoryTest.php b/tests/phpunit/unit/includes/user/ActorStoreFactoryTest.php
index f746e3b70de1..305bc74ec670 100644
--- a/tests/phpunit/unit/includes/user/ActorStoreFactoryTest.php
+++ b/tests/phpunit/unit/includes/user/ActorStoreFactoryTest.php
@@ -3,6 +3,7 @@
namespace MediaWiki\Tests\User;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\User\ActorNormalization;
use MediaWiki\User\ActorStore;
use MediaWiki\User\ActorStoreFactory;
@@ -25,32 +26,32 @@ class ActorStoreFactoryTest extends MediaWikiUnitTestCase {
yield 'local, no shared' => [
false, // $domain,
[
- 'SharedDB' => false,
- 'SharedTables' => false
+ MainConfigNames::SharedDB => false,
+ MainConfigNames::SharedTables => false
], // $config
false, // $expectedDomain
];
yield 'foreign, no shared' => [
'acmewiki', // $domain,
[
- 'SharedDB' => false,
- 'SharedTables' => false
+ MainConfigNames::SharedDB => false,
+ MainConfigNames::SharedTables => false
], //
'acmewiki', // $expectedDomain
];
yield 'local, shared' => [
false, // $domain,
[
- 'SharedDB' => [ 'sharedwiki' ],
- 'SharedTables' => [ 'user', 'actor' ]
+ MainConfigNames::SharedDB => [ 'sharedwiki' ],
+ MainConfigNames::SharedTables => [ 'user', 'actor' ]
], // $config
false, // $expectedDomain
];
yield 'foreign, shared' => [
'acmewiki', // $domain,
[
- 'SharedDB' => [ 'sharedwiki' ],
- 'SharedTables' => [ 'user', 'actor' ]
+ MainConfigNames::SharedDB => [ 'sharedwiki' ],
+ MainConfigNames::SharedTables => [ 'user', 'actor' ]
], // $config
false, // $expectedDomain
];
diff --git a/tests/phpunit/unit/includes/user/CentralId/CentralIdLookupFactoryTest.php b/tests/phpunit/unit/includes/user/CentralId/CentralIdLookupFactoryTest.php
index 9295269a49e5..8f154d489ca5 100644
--- a/tests/phpunit/unit/includes/user/CentralId/CentralIdLookupFactoryTest.php
+++ b/tests/phpunit/unit/includes/user/CentralId/CentralIdLookupFactoryTest.php
@@ -7,6 +7,7 @@ use HashConfig;
use InvalidArgumentException;
use LocalIdLookup;
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\User\CentralId\CentralIdLookupFactory;
use MediaWiki\User\UserIdentityLookup;
use MediaWikiUnitTestCase;
@@ -33,9 +34,9 @@ class CentralIdLookupFactoryTest extends MediaWikiUnitTestCase {
->willReturnMap( [
[ 'DBLoadBalancer', $this->createMock( ILoadBalancer::class ) ],
[ 'MainConfig', new HashConfig( [
- 'SharedDB' => null,
- 'SharedTables' => [],
- 'LocalDatabases' => [],
+ MainConfigNames::SharedDB => null,
+ MainConfigNames::SharedTables => [],
+ MainConfigNames::LocalDatabases => [],
] ) ],
] );
$localIdLookupTest = [
@@ -49,14 +50,14 @@ class CentralIdLookupFactoryTest extends MediaWikiUnitTestCase {
new ServiceOptions(
CentralIdLookupFactory::CONSTRUCTOR_OPTIONS,
[
- 'CentralIdLookupProviders' => [
+ MainConfigNames::CentralIdLookupProviders => [
'local' => $localIdLookupTest,
'local2' => $localIdLookupTest,
'mock' => [ 'factory' => function () {
return $this->centralLookupMock;
} ]
],
- 'CentralIdLookupProvider' => 'mock',
+ MainConfigNames::CentralIdLookupProvider => 'mock',
]
),
new ObjectFactory( $services ),
diff --git a/tests/phpunit/unit/includes/user/UserNameUtilsTest.php b/tests/phpunit/unit/includes/user/UserNameUtilsTest.php
index e6298a821745..9fdaf104db90 100644
--- a/tests/phpunit/unit/includes/user/UserNameUtilsTest.php
+++ b/tests/phpunit/unit/includes/user/UserNameUtilsTest.php
@@ -1,5 +1,6 @@
<?php
+use MediaWiki\MainConfigNames;
use MediaWiki\Tests\Unit\DummyServicesTrait;
use MediaWiki\User\UserRigorOptions;
use Psr\Log\LogLevel;
@@ -59,7 +60,7 @@ class UserNameUtilsTest extends MediaWikiUnitTestCase {
->willReturn( 'reserved-user' );
$utils = $this->getDummyUserNameUtils( [
- 'ReservedUsernames' => [
+ MainConfigNames::ReservedUsernames => [
'MediaWiki default',
'msg:reserved-user'
],
diff --git a/tests/phpunit/unit/includes/watchlist/WatchlistManagerTest.php b/tests/phpunit/unit/includes/watchlist/WatchlistManagerTest.php
index 6f539e40fdb7..226bb7d1cd38 100644
--- a/tests/phpunit/unit/includes/watchlist/WatchlistManagerTest.php
+++ b/tests/phpunit/unit/includes/watchlist/WatchlistManagerTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Config\ServiceOptions;
+use MediaWiki\MainConfigNames;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Page\PageIdentityValue;
use MediaWiki\Page\PageReference;
@@ -48,7 +49,7 @@ class WatchlistManagerUnitTest extends MediaWikiUnitTestCase {
private function getManager( array $params = [] ) {
$config = $params['config'] ?? [
'UseEnotif' => false,
- 'ShowUpdatedMarker' => false,
+ MainConfigNames::ShowUpdatedMarker => false,
];
$options = new ServiceOptions(
WatchlistManager::CONSTRUCTOR_OPTIONS,
@@ -180,7 +181,7 @@ class WatchlistManagerUnitTest extends MediaWikiUnitTestCase {
$config = [
'UseEnotif' => true,
- 'ShowUpdatedMarker' => true
+ MainConfigNames::ShowUpdatedMarker => true
];
$userIdentity = new UserIdentityValue( 0, 'User Name' );
@@ -209,7 +210,7 @@ class WatchlistManagerUnitTest extends MediaWikiUnitTestCase {
$config = [
'UseEnotif' => true,
- 'ShowUpdatedMarker' => true
+ MainConfigNames::ShowUpdatedMarker => true
];
$userIdentity = new UserIdentityValue( 100, 'User Name' );
@@ -336,7 +337,7 @@ class WatchlistManagerUnitTest extends MediaWikiUnitTestCase {
$config = [
'UseEnotif' => true,
- 'ShowUpdatedMarker' => true
+ MainConfigNames::ShowUpdatedMarker => true
];
$userIdentity = new UserIdentityValue( 0, 'User Name' );
@@ -370,7 +371,7 @@ class WatchlistManagerUnitTest extends MediaWikiUnitTestCase {
$config = [
'UseEnotif' => true,
- 'ShowUpdatedMarker' => true
+ MainConfigNames::ShowUpdatedMarker => true
];
$userIdentity = new UserIdentityValue( 100, 'User Name' );