Merge "Use PHP 7 '<=>' operator in 'sort()' callbacks"

diff --combined includes/GlobalFunctions.php
index 00e35b1,a9cad25..232e7cf
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -121,7 -121,7 +121,7 @@@ function wfArrayDiff2_cmp( $a, $b ) 
        if ( is_string( $a ) && is_string( $b ) ) {
                return strcmp( $a, $b );
        } elseif ( count( $a ) !== count( $b ) ) {
-               return count( $a ) < count( $b ) ? -1 : 1;
+               return count( $a ) <=> count( $b );
        } else {
                reset( $a );
                reset( $b );
@@@ -3150,6 -3150,17 +3150,6 @@@ function wfGetMessageCacheStorage() 
        return ObjectCache::getInstance( $wgMessageCacheType );
  }
  
 -/**
 - * Get the cache object used by the parser cache
 - *
 - * @deprecated since 1.30, use MediaWikiServices::getParserCache()->getCacheStorage()
 - * @return BagOStuff
 - */
 -function wfGetParserCacheStorage() {
 -      global $wgParserCacheType;
 -      return ObjectCache::getInstance( $wgParserCacheType );
 -}
 -
  /**
   * Call hook functions defined in $wgHooks
   *