Merge "GlobalFunctions: Avoid unnecessary fully-namespaced MediaWikiServices"

diff --combined includes/GlobalFunctions.php
index 10a67c3,e1ae88f..9c70639
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -1276,7 -1276,7 +1276,7 @@@ function wfIncrStats( $key, $count = 1 
   * @return bool
   */
  function wfReadOnly() {
-       return \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode()
+       return MediaWikiServices::getInstance()->getReadOnlyMode()
                ->isReadOnly();
  }
  
@@@ -1289,7 -1289,7 +1289,7 @@@
   * @return string|bool String when in read-only mode; false otherwise
   */
  function wfReadOnlyReason() {
-       return \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode()
+       return MediaWikiServices::getInstance()->getReadOnlyMode()
                ->getReason();
  }
  
@@@ -1300,7 -1300,7 +1300,7 @@@
   * @since 1.27
   */
  function wfConfiguredReadOnlyReason() {
-       return \MediaWiki\MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()
+       return MediaWikiServices::getInstance()->getConfiguredReadOnlyMode()
                ->getReason();
  }
  
@@@ -2960,8 -2960,6 +2960,8 @@@ function wfGetPrecompiledData( $name ) 
  }
  
  /**
 + * @deprecated since 1.30 Call makeKey on a ObjectCache instance
 + *
   * Make a cache key for the local wiki.
   *
   * @param string $args,...
@@@ -2994,8 -2992,6 +2994,8 @@@ function wfForeignMemcKey( $db, $prefi
  }
  
  /**
 + * @deprecated since 1.30 Call makeGlobalKey on a ObjectCache instance
 + *
   * Make a cache key with database-agnostic prefix.
   *
   * Doesn't have a wiki-specific namespace. Uses a generic 'global' prefix
@@@ -3083,9 -3079,9 +3083,9 @@@ function wfGetDB( $db, $groups = [], $w
   */
  function wfGetLB( $wiki = false ) {
        if ( $wiki === false ) {
-               return \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancer();
+               return MediaWikiServices::getInstance()->getDBLoadBalancer();
        } else {
-               $factory = \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+               $factory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
                return $factory->getMainLB( $wiki );
        }
  }
@@@ -3098,7 -3094,7 +3098,7 @@@
   * @return \Wikimedia\Rdbms\LBFactory
   */
  function wfGetLBFactory() {
-       return \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+       return MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
  }
  
  /**