Merge "Type hint against interface for LoadBalancer in MediaWikiServices"

diff --combined includes/MediaWikiServices.php
index a37e32e,27c71ff..7fda452
--- 1/includes/MediaWikiServices.php
--- 2/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -33,9 -33,8 +33,8 @@@ use MediaWiki\Revision\RevisionStore
  use OldRevisionImporter;
  use MediaWiki\Revision\RevisionStoreFactory;
  use UploadRevisionImporter;
- use Wikimedia\Rdbms\LBFactory;
+ use Wikimedia\Rdbms\ILoadBalancer;
  use LinkCache;
- use Wikimedia\Rdbms\LoadBalancer;
  use MediaHandlerFactory;
  use MediaWiki\Config\ConfigRepository;
  use MediaWiki\Linker\LinkRenderer;
@@@ -62,6 -61,7 +61,7 @@@ use SkinFactory
  use TitleFormatter;
  use TitleParser;
  use VirtualRESTServiceClient;
+ use Wikimedia\Rdbms\LBFactory;
  use Wikimedia\Services\SalvageableService;
  use Wikimedia\Services\ServiceContainer;
  use Wikimedia\Services\NoSuchServiceException;
@@@ -549,7 -549,7 +549,7 @@@ class MediaWikiServices extends Service
  
        /**
         * @since 1.28
-        * @return LoadBalancer The main DB load balancer for the local wiki.
+        * @return ILoadBalancer The main DB load balancer for the local wiki.
         */
        public function getDBLoadBalancer() {
                return $this->getService( 'DBLoadBalancer' );
@@@ -571,14 -571,6 +571,14 @@@
                return $this->getService( 'EventRelayerGroup' );
        }
  
 +      /**
 +       * @since 1.34
 +       * @return \ExternalStoreAccess
 +       */
 +      public function getExternalStoreAccess() {
 +              return $this->getService( 'ExternalStoreAccess' );
 +      }
 +
        /**
         * @since 1.31
         * @return \ExternalStoreFactory