tests: Use namespaced IDatabase class

Change-Id: I7171ff26faee00d9eaabc33c2f3d91049ea0b40d

26 files changed, 38 insertions, 3 deletions

diff --git a/tests/parser/DbTestPreviewer.php b/tests/parser/DbTestPreviewer.php
index d8996ff34355..401441eeec1a 100644
--- a/tests/parser/DbTestPreviewer.php
+++ b/tests/parser/DbTestPreviewer.php
@@ -19,6 +19,8 @@
  * @ingroup Testing
  */
 
+use Wikimedia\Rdbms\IDatabase;
+
 class DbTestPreviewer extends TestRecorder {
 	protected $filter; // /< Test name filter callback
 	protected $lb; // /< Database load balancer
diff --git a/tests/parser/DbTestRecorder.php b/tests/parser/DbTestRecorder.php
index d784ddd0afd4..3cbe3b6a1356 100644
--- a/tests/parser/DbTestRecorder.php
+++ b/tests/parser/DbTestRecorder.php
@@ -23,7 +23,7 @@ use Wikimedia\Rdbms\IMaintainableDatabase;
 
 class DbTestRecorder extends TestRecorder {
 	public $version;
-	/** @var Database */
+	/** @var IMaintainableDatabase */
 	private $db;
 
 	public function __construct( IMaintainableDatabase $db ) {
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index f9a0d3b85356..e462b98d23db 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -45,6 +45,8 @@ use Wikimedia\Parsoid\Parsoid;
 use Wikimedia\Parsoid\Utils\ContentUtils;
 use Wikimedia\Parsoid\Utils\DOMCompat;
 use Wikimedia\Parsoid\Utils\DOMUtils;
+use Wikimedia\Rdbms\DBError;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\ScopedCallback;
 use Wikimedia\TestingAccessWrapper;
 
@@ -101,7 +103,7 @@ class ParserTestRunner {
 
 	/**
 	 * Our connection to the database
-	 * @var Database
+	 * @var IDatabase
 	 */
 	private $db;
 
diff --git a/tests/phpunit/includes/ActorMigrationTest.php b/tests/phpunit/includes/ActorMigrationTest.php
index 4292b44f317f..6527694767e2 100644
--- a/tests/phpunit/includes/ActorMigrationTest.php
+++ b/tests/phpunit/includes/ActorMigrationTest.php
@@ -5,6 +5,7 @@ use MediaWiki\User\ActorStoreFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use PHPUnit\Framework\MockObject\MockObject;
+use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**
  * @group Database
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 59ce3a317ef2..5fce9086e15e 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -10,6 +10,7 @@ use MediaWiki\ResourceLoader as RL;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
index f927dd60f7cc..763ac518acc8 100644
--- a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index 00af2ae89353..c695b98f4319 100644
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -4,6 +4,7 @@ use MediaWiki\Tests\Unit\Libs\Rdbms\AddQuoterMock;
 use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\Platform\SQLPlatform;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\RequestTimeout\RequestTimeout;
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index aadec470244a..ef9f714e6ff2 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -24,6 +24,7 @@
  */
 
 use Wikimedia\Rdbms\ChronologyProtector;
+use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
diff --git a/tests/phpunit/includes/db/LoadBalancerTest.php b/tests/phpunit/includes/db/LoadBalancerTest.php
index c0eded15726d..2b7f7e2e40a1 100644
--- a/tests/phpunit/includes/db/LoadBalancerTest.php
+++ b/tests/phpunit/includes/db/LoadBalancerTest.php
@@ -25,6 +25,8 @@ use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
 use Wikimedia\Rdbms\DBError;
 use Wikimedia\Rdbms\DBReadOnlyRoleError;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\Rdbms\LoadMonitorNull;
 use Wikimedia\Rdbms\TransactionManager;
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index df2f6248bafc..3133537a7215 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\Rdbms\FakeResultWrapper;
+
 /**
  * @covers MigrateFileRepoLayout
  */
diff --git a/tests/phpunit/includes/pager/HistoryPagerTest.php b/tests/phpunit/includes/pager/HistoryPagerTest.php
index 3efcf3956947..fc5d08d8e106 100644
--- a/tests/phpunit/includes/pager/HistoryPagerTest.php
+++ b/tests/phpunit/includes/pager/HistoryPagerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Revision\MutableRevisionRecord;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
index fd120f21585c..1fe8b535369c 100644
--- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
+++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Wikimedia\Rdbms\Database;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php b/tests/phpunit/includes/specials/ContribsPagerTest.php
index b87df86064e8..7ca3f14c555d 100644
--- a/tests/phpunit/includes/specials/ContribsPagerTest.php
+++ b/tests/phpunit/includes/specials/ContribsPagerTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
index e651a555e8e7..d5bd3a92d079 100644
--- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -7,6 +7,8 @@
  * @author Antoine Musso
  */
 
+use Wikimedia\Rdbms\ResultWrapper;
+
 /**
  * @group Database
  * @covers QueryPage<extended>
diff --git a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
index 46c705f1505e..74d43acc3fd4 100644
--- a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
+++ b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
@@ -10,6 +10,7 @@ use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\CommentFormatter\RowCommentFormatter;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\SpecialPage\SpecialPageFactory;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/includes/user/UserOptionsManagerTest.php b/tests/phpunit/includes/user/UserOptionsManagerTest.php
index 95040f99e386..a507a2d67557 100644
--- a/tests/phpunit/includes/user/UserOptionsManagerTest.php
+++ b/tests/phpunit/includes/user/UserOptionsManagerTest.php
@@ -7,6 +7,7 @@ use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\User\UserOptionsManager;
 use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index fc310f5cc439..a508233fa989 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -12,6 +12,7 @@ use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\User\UserIdentityValue;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\LBFactory;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/integration/includes/cache/HtmlCacheUpdaterIntegrationTest.php b/tests/phpunit/integration/includes/cache/HtmlCacheUpdaterIntegrationTest.php
index 42ae451717f9..970e184f852f 100644
--- a/tests/phpunit/integration/includes/cache/HtmlCacheUpdaterIntegrationTest.php
+++ b/tests/phpunit/integration/includes/cache/HtmlCacheUpdaterIntegrationTest.php
@@ -4,6 +4,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**
  * @group Cache
diff --git a/tests/phpunit/integration/includes/db/DatabaseMysqlTest.php b/tests/phpunit/integration/includes/db/DatabaseMysqlTest.php
index cd6d27a32dcb..59bb28d5df56 100644
--- a/tests/phpunit/integration/includes/db/DatabaseMysqlTest.php
+++ b/tests/phpunit/integration/includes/db/DatabaseMysqlTest.php
@@ -2,11 +2,14 @@
 
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DatabaseMysqlBase;
 use Wikimedia\Rdbms\DBQueryDisconnectedError;
+use Wikimedia\Rdbms\DBQueryError;
 use Wikimedia\Rdbms\DBQueryTimeoutError;
 use Wikimedia\Rdbms\DBSessionStateError;
 use Wikimedia\Rdbms\DBTransactionStateError;
 use Wikimedia\Rdbms\DBUnexpectedError;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\TransactionManager;
 
 /**
diff --git a/tests/phpunit/integration/includes/db/DatabasePostgresTest.php b/tests/phpunit/integration/includes/db/DatabasePostgresTest.php
index 84e45dcd0206..002ea0a261e1 100644
--- a/tests/phpunit/integration/includes/db/DatabasePostgresTest.php
+++ b/tests/phpunit/integration/includes/db/DatabasePostgresTest.php
@@ -2,6 +2,7 @@
 
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabasePostgres;
+use Wikimedia\Rdbms\DBQueryError;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\ScopedCallback;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/integration/includes/libs/rdbms/resultwrapper/ResultWrapperTest.php b/tests/phpunit/integration/includes/libs/rdbms/resultwrapper/ResultWrapperTest.php
index 3e4f4b12b42b..86351569d9d1 100644
--- a/tests/phpunit/integration/includes/libs/rdbms/resultwrapper/ResultWrapperTest.php
+++ b/tests/phpunit/integration/includes/libs/rdbms/resultwrapper/ResultWrapperTest.php
@@ -21,6 +21,8 @@
  * @file
  */
 
+use Wikimedia\Rdbms\IMaintainableDatabase;
+
 /**
  * @group Database
  * @covers \Wikimedia\Rdbms\ResultWrapper
diff --git a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
index 64ee232bda19..dfcd97863a75 100644
--- a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
+++ b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -176,7 +177,7 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiUnitTestCase {
 	 */
 	protected function modifyQueryHelper( $groupDefinition, $input ) {
 		$ctx = $this->createMock( IContextSource::class );
-		$dbr = $this->createMock( Wikimedia\Rdbms\IDatabase::class );
+		$dbr = $this->createMock( IDatabase::class );
 		$tables = [];
 		$fields = [];
 		$conds = [];
diff --git a/tests/phpunit/unit/includes/filebackend/lockmanager/MySqlLockManagerTest.php b/tests/phpunit/unit/includes/filebackend/lockmanager/MySqlLockManagerTest.php
index d83fdc744125..6186967528b7 100644
--- a/tests/phpunit/unit/includes/filebackend/lockmanager/MySqlLockManagerTest.php
+++ b/tests/phpunit/unit/includes/filebackend/lockmanager/MySqlLockManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\Rdbms\DBError;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\TestingAccessWrapper;
 
 class MySqlLockManagerTest extends MediaWikiUnitTestCase {
diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
index 7793bd154b97..ed1750bbd0e9 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
@@ -25,7 +25,9 @@
 
 use MediaWiki\Tests\Unit\Libs\Rdbms\AddQuoterMock;
 use Wikimedia\Rdbms\DatabaseDomain;
+use Wikimedia\Rdbms\DatabaseMysqlBase;
 use Wikimedia\Rdbms\DatabaseMysqli;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\MySQLPrimaryPos;
diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseSQLTest.php
index cf72c4dde649..34a4325c2852 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DBError;
 use Wikimedia\Rdbms\DBTransactionError;
 use Wikimedia\Rdbms\DBTransactionStateError;
 use Wikimedia\Rdbms\DBUnexpectedError;
diff --git a/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php b/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
index 77f5291f1873..471ea145cb99 100644
--- a/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
+++ b/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\User\UserIdentityValue;
+use Wikimedia\Rdbms\DBReadOnlyError;
 
 /**
  * @author Addshore