From 623d3dc419e7b12520d6eec47c3cb2911df56846 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <ladsgroup@gmail.com>
Date: Thu, 4 May 2023 23:41:21 +0200
Subject: rdbms: Move ReadOnlyMode and ConfiguredReadOnlyMode to rdbms library

The db/ directory does not have an owner and it's a mess in general.
These classes don't depend on anything in core except the rdbms library.
Let's simply move it there. In other words, Krinkle made me do it.

Since the class was moved in I6202e52ba73 merged less than a week ago,
no need to alias anything.

Bug: T321882
Change-Id: I24ceeb8bf765a50f441270136acd612359d50aa2
---
 tests/phpunit/includes/EditPageConstraintsTest.php                    | 2 +-
 tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php | 2 +-
 tests/phpunit/includes/auth/AuthManagerTest.php                       | 2 +-
 tests/phpunit/integration/includes/page/RollbackPageTest.php          | 2 +-
 tests/phpunit/mocks/DummyServicesTrait.php                            | 4 ++--
 tests/phpunit/tests/MediaWikiIntegrationTestCaseTest.php              | 2 +-
 tests/phpunit/unit/includes/ReadOnlyModeTest.php                      | 4 ++--
 tests/phpunit/unit/includes/block/DatabaseBlockStoreFactoryTest.php   | 2 +-
 tests/phpunit/unit/includes/db/MWLBFactoryTest.php                    | 2 +-
 .../unit/includes/editpage/Constraint/EditConstraintFactoryTest.php   | 2 +-
 .../unit/includes/editpage/Constraint/ReadOnlyConstraintTest.php      | 2 +-
 tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php      | 2 +-
 tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php | 2 +-
 tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php     | 2 +-
 tests/phpunit/unit/includes/page/UndeletePageTest.php                 | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/phpunit/includes/EditPageConstraintsTest.php b/tests/phpunit/includes/EditPageConstraintsTest.php
index e0f549cff37e..076858de70ad 100644
--- a/tests/phpunit/includes/EditPageConstraintsTest.php
+++ b/tests/phpunit/includes/EditPageConstraintsTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Title\Title;
+use Wikimedia\Rdbms\ReadOnlyMode;
 
 /**
  * Integration tests for the various edit constraints, ensuring
diff --git a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php
index a5293131e18e..f587a5ad2adb 100644
--- a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php
+++ b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php
@@ -156,7 +156,7 @@ namespace FooExtension {
 	}
 
 	class ServiceHooks {
-		public function __construct( \MediaWiki\DB\ReadOnlyMode $readOnlyMode ) {
+		public function __construct( \Wikimedia\Rdbms\ReadOnlyMode $readOnlyMode ) {
 		}
 
 		public function onMash( &$arg ) {
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index f7e13276df99..ca6e8bf2df5f 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -10,7 +10,6 @@ use MediaWiki\Auth\Hook\SecuritySensitiveOperationStatusHook;
 use MediaWiki\Auth\Hook\UserLoggedInHook;
 use MediaWiki\Block\BlockManager;
 use MediaWiki\Block\DatabaseBlock;
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
 use MediaWiki\Languages\LanguageConverterFactory;
@@ -35,6 +34,7 @@ use StatusValue;
 use WebRequest;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\ILoadBalancer;
+use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\ScopedCallback;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/integration/includes/page/RollbackPageTest.php b/tests/phpunit/integration/includes/page/RollbackPageTest.php
index a9fd950d4a39..bee9609f6c0a 100644
--- a/tests/phpunit/integration/includes/page/RollbackPageTest.php
+++ b/tests/phpunit/integration/includes/page/RollbackPageTest.php
@@ -5,7 +5,6 @@ namespace MediaWiki\Tests\Page;
 use ChangeTags;
 use DatabaseLogEntry;
 use JsonContent;
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
@@ -20,6 +19,7 @@ use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use RecentChange;
 use User;
+use Wikimedia\Rdbms\ReadOnlyMode;
 use WikiPage;
 use WikitextContent;
 
diff --git a/tests/phpunit/mocks/DummyServicesTrait.php b/tests/phpunit/mocks/DummyServicesTrait.php
index 098e057be2fa..added207306a 100644
--- a/tests/phpunit/mocks/DummyServicesTrait.php
+++ b/tests/phpunit/mocks/DummyServicesTrait.php
@@ -30,8 +30,6 @@ use MalformedTitleException;
 use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Content\IContentHandlerFactory;
-use MediaWiki\DB\ConfiguredReadOnlyMode;
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\LinkTarget;
@@ -52,7 +50,9 @@ use WatchedItemStore;
 use Wikimedia\Message\ITextFormatter;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ObjectFactory\ObjectFactory;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\ILoadBalancer;
+use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\Services\NoSuchServiceException;
 
 /**
diff --git a/tests/phpunit/tests/MediaWikiIntegrationTestCaseTest.php b/tests/phpunit/tests/MediaWikiIntegrationTestCaseTest.php
index 8957b77ac098..48fb86cab55c 100644
--- a/tests/phpunit/tests/MediaWikiIntegrationTestCaseTest.php
+++ b/tests/phpunit/tests/MediaWikiIntegrationTestCaseTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
@@ -9,6 +8,7 @@ use MediaWiki\Title\Title;
 use PHPUnit\Framework\AssertionFailedError;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ReadOnlyMode;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/ReadOnlyModeTest.php b/tests/phpunit/unit/includes/ReadOnlyModeTest.php
index d25bb6278a8d..f678dd266abc 100644
--- a/tests/phpunit/unit/includes/ReadOnlyModeTest.php
+++ b/tests/phpunit/unit/includes/ReadOnlyModeTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use MediaWiki\DB\ConfiguredReadOnlyMode;
-use MediaWiki\DB\ReadOnlyMode;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
+use Wikimedia\Rdbms\ReadOnlyMode;
 
 /**
  * @covers ReadOnlyMode
diff --git a/tests/phpunit/unit/includes/block/DatabaseBlockStoreFactoryTest.php b/tests/phpunit/unit/includes/block/DatabaseBlockStoreFactoryTest.php
index 45f2d7b7a0cf..0493558172c7 100644
--- a/tests/phpunit/unit/includes/block/DatabaseBlockStoreFactoryTest.php
+++ b/tests/phpunit/unit/includes/block/DatabaseBlockStoreFactoryTest.php
@@ -9,12 +9,12 @@ use MediaWiki\Block\DatabaseBlockStoreFactory;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\DAO\WikiAwareEntity;
-use MediaWiki\DB\ConfiguredReadOnlyMode;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\User\ActorStoreFactory;
 use MediaWiki\User\UserFactory;
 use MediaWikiUnitTestCase;
 use Psr\Log\LoggerInterface;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\LBFactory;
 use Wikimedia\Rdbms\LoadBalancer;
 
diff --git a/tests/phpunit/unit/includes/db/MWLBFactoryTest.php b/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
index 419634793212..2c2f5d475011 100644
--- a/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
+++ b/tests/phpunit/unit/includes/db/MWLBFactoryTest.php
@@ -19,7 +19,7 @@
  */
 
 use MediaWiki\Config\ServiceOptions;
-use MediaWiki\DB\ConfiguredReadOnlyMode;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\Rdbms\DatabaseDomain;
 use Wikimedia\Rdbms\LBFactorySimple;
 use Wikimedia\RequestTimeout\CriticalSectionProvider;
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
index 4c41328a980c..221312f1b55e 100644
--- a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
+++ b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
@@ -19,7 +19,6 @@
  */
 
 use MediaWiki\Config\ServiceOptions;
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\EditPage\Constraint\EditConstraintFactory;
 use MediaWiki\EditPage\Constraint\EditFilterMergedContentHookConstraint;
 use MediaWiki\EditPage\Constraint\PageSizeConstraint;
@@ -34,6 +33,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Title\Title;
 use Psr\Log\NullLogger;
+use Wikimedia\Rdbms\ReadOnlyMode;
 
 /**
  * Tests the EditConstraintFactory
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/ReadOnlyConstraintTest.php b/tests/phpunit/unit/includes/editpage/Constraint/ReadOnlyConstraintTest.php
index e510db381930..1542a76b6455 100644
--- a/tests/phpunit/unit/includes/editpage/Constraint/ReadOnlyConstraintTest.php
+++ b/tests/phpunit/unit/includes/editpage/Constraint/ReadOnlyConstraintTest.php
@@ -18,9 +18,9 @@
  * @file
  */
 
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\EditPage\Constraint\IEditConstraint;
 use MediaWiki\EditPage\Constraint\ReadOnlyConstraint;
+use Wikimedia\Rdbms\ReadOnlyMode;
 
 /**
  * Tests the ReadOnlyConstraint
diff --git a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
index d03b1d0441c9..d7987d64c52c 100644
--- a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
+++ b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTest.php
@@ -1,10 +1,10 @@
 <?php
 
 use MediaWiki\Config\ServiceOptions;
-use MediaWiki\DB\ConfiguredReadOnlyMode;
 use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 
 /**
  * @coversDefaultClass FileBackendGroup
diff --git a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
index 12f84c65b22b..9aa1df880f4b 100644
--- a/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
+++ b/tests/phpunit/unit/includes/filebackend/FileBackendGroupTestTrait.php
@@ -1,10 +1,10 @@
 <?php
 
-use MediaWiki\DB\ConfiguredReadOnlyMode;
 use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php b/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
index 0cd5fed2dcbb..421f24a130a6 100644
--- a/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
+++ b/tests/phpunit/unit/includes/jobqueue/JobQueueGroupFactoryTest.php
@@ -1,9 +1,9 @@
 <?php
 
 use MediaWiki\Config\ServiceOptions;
-use MediaWiki\DB\ConfiguredReadOnlyMode;
 use MediaWiki\JobQueue\JobQueueGroupFactory;
 use MediaWiki\MainConfigNames;
+use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 use Wikimedia\UUID\GlobalIdGenerator;
 
 /**
diff --git a/tests/phpunit/unit/includes/page/UndeletePageTest.php b/tests/phpunit/unit/includes/page/UndeletePageTest.php
index 5f2a8b8eb764..a76c1018ba31 100644
--- a/tests/phpunit/unit/includes/page/UndeletePageTest.php
+++ b/tests/phpunit/unit/includes/page/UndeletePageTest.php
@@ -6,7 +6,6 @@ use Generator;
 use JobQueueGroup;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Content\IContentHandlerFactory;
-use MediaWiki\DB\ReadOnlyMode;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
@@ -24,6 +23,7 @@ use Psr\Log\NullLogger;
 use RepoGroup;
 use Wikimedia\Message\ITextFormatter;
 use Wikimedia\Rdbms\ILoadBalancer;
+use Wikimedia\Rdbms\ReadOnlyMode;
 use WikiPage;
 
 /**
-- 
cgit v1.2.3