Fix types around ILoadBalancer and IResultWrapper

Change-Id: I08531ccc6db046114f3535cfe6c108936dfff0d0

diff --git a/includes/ReadOnlyMode.php b/includes/ReadOnlyMode.php
index 1a09290..d0da10e 100644 (file)
--- a/includes/ReadOnlyMode.php
+++ b/includes/ReadOnlyMode.php
@@ -1,6 +1,6 @@
 <?php
 
-use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
  * A service class for fetching the wiki's current read-only mode.
@@ -12,10 +12,10 @@ class ReadOnlyMode {
        /** @var ConfiguredReadOnlyMode */
        private $configuredReadOnly;
 
-       /** @var LoadBalancer */
+       /** @var ILoadBalancer */
        private $loadBalancer;
 
-       public function __construct( ConfiguredReadOnlyMode $cro, LoadBalancer $loadBalancer ) {
+       public function __construct( ConfiguredReadOnlyMode $cro, ILoadBalancer $loadBalancer ) {
                $this->configuredReadOnly = $cro;
                $this->loadBalancer = $loadBalancer;
        }

diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php
index f269afe..ec1c08c 100644 (file)
--- a/includes/Revision/RevisionStore.php
+++ b/includes/Revision/RevisionStore.php
@@ -63,7 +63,7 @@ use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * Service for looking up page revisions.
@@ -1638,7 +1638,7 @@ class RevisionStore
         * Factory method for SlotRecords based on known slot rows.
         *
         * @param int $revId The revision to load slots for.
-        * @param object[]|ResultWrapper $slotRows
+        * @param object[]|IResultWrapper $slotRows
         * @param int $queryFlags
         * @param Title $title
         *

diff --git a/includes/SiteStatsInit.php b/includes/SiteStatsInit.php
index e97db2d..932e1c3 100644 (file)
--- a/includes/SiteStatsInit.php
+++ b/includes/SiteStatsInit.php
@@ -191,7 +191,7 @@ class SiteStatsInit {
 
        /**
         * @param int $index
-        * @param string[] $groups
+        * @param string[]|string $groups
         * @return IDatabase
         */
        private static function getDB( $index, $groups = [] ) {

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index b1d5a50..4df2f56 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -22,7 +22,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**
@@ -313,7 +313,7 @@ class HistoryAction extends FormlessAction {
         * @param int $limit The limit number of revisions to get
         * @param int $offset
         * @param int $direction Either self::DIR_PREV or self::DIR_NEXT
-        * @return ResultWrapper
+        * @return IResultWrapper
         */
        function fetchRevisions( $limit, $offset, $direction ) {
                // Fail if article doesn't exist.

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index c8e31df..d80a718 100644 (file)
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -28,7 +28,7 @@ class DBConnRef implements IDatabase {
 
        /**
         * @param ILoadBalancer $lb Connection manager for $conn
-        * @param Database|array $conn Database or (server index, query groups, domain, flags)
+        * @param IDatabase|array $conn Database or (server index, query groups, domain, flags)
         * @param int $role The type of connection asked for; one of DB_MASTER/DB_REPLICA
         * @internal This method should not be called outside of LoadBalancer
         */

diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index b2403ce..bb6a6b3 100644 (file)
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -1,6 +1,6 @@
 <?php
 
-use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
  * Represents the site configuration of a wiki.
@@ -38,7 +38,7 @@ class DBSiteStore implements SiteStore {
        protected $sites = null;
 
        /**
-        * @var LoadBalancer
+        * @var ILoadBalancer
         */
        private $dbLoadBalancer;
 
@@ -48,9 +48,9 @@ class DBSiteStore implements SiteStore {
         * @todo inject some kind of connection manager that is aware of the target wiki,
         * instead of injecting a LoadBalancer.
         *
-        * @param LoadBalancer $dbLoadBalancer
+        * @param ILoadBalancer $dbLoadBalancer
         */
-       public function __construct( LoadBalancer $dbLoadBalancer ) {
+       public function __construct( ILoadBalancer $dbLoadBalancer ) {
                $this->dbLoadBalancer = $dbLoadBalancer;
        }
 

diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php
index b134bfe..f6ad623 100644 (file)
--- a/includes/watcheditem/WatchedItemQueryService.php
+++ b/includes/watcheditem/WatchedItemQueryService.php
@@ -4,7 +4,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
  * Class performing complex database queries related to WatchedItems.
@@ -53,7 +53,7 @@ class WatchedItemQueryService {
        const SORT_DESC = 'DESC';
 
        /**
-        * @var LoadBalancer
+        * @var ILoadBalancer
         */
        private $loadBalancer;
 
@@ -70,7 +70,7 @@ class WatchedItemQueryService {
        private $watchedItemStore;
 
        public function __construct(
-               LoadBalancer $loadBalancer,
+               ILoadBalancer $loadBalancer,
                CommentStore $commentStore,
                ActorMigration $actorMigration,
                WatchedItemStoreInterface $watchedItemStore