Merge "Replace wfWiki() usage with WikiMap in some additional places"

diff --combined maintenance/cleanupSpam.php
index 13f3cfa,27ada59..4cc52a4
--- 1/maintenance/cleanupSpam.php
--- 2/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@@ -21,8 -21,6 +21,8 @@@
   * @ingroup Maintenance
   */
  
 +use MediaWiki\Storage\RevisionRecord;
 +
  require_once __DIR__ . '/Maintenance.php';
  
  /**
@@@ -69,9 -67,9 +69,9 @@@ class CleanupSpam extends Maintenance 
                        // Clean up spam on all wikis
                        $this->output( "Finding spam on " . count( $wgLocalDatabases ) . " wikis\n" );
                        $found = false;
-                       foreach ( $wgLocalDatabases as $wikiID ) {
+                       foreach ( $wgLocalDatabases as $wikiId ) {
                                /** @var Database $dbr */
-                               $dbr = $this->getDB( DB_REPLICA, [], $wikiID );
+                               $dbr = $this->getDB( DB_REPLICA, [], $wikiId );
  
                                foreach ( $protConds as $conds ) {
                                        $count = $dbr->selectField(
@@@ -84,9 -82,9 +84,9 @@@
                                                $found = true;
                                                $cmd = wfShellWikiCmd(
                                                        "$IP/maintenance/cleanupSpam.php",
-                                                       [ '--wiki', $wikiID, $spec ]
+                                                       [ '--wiki', $wikiId, $spec ]
                                                );
-                                               passthru( "$cmd | sed 's/^/$wikiID:  /'" );
+                                               passthru( "$cmd | sed 's/^/$wikiId:  /'" );
                                        }
                                }
                        }
@@@ -138,8 -136,8 +138,8 @@@
                $rev = Revision::newFromTitle( $title );
                $currentRevId = $rev->getId();
  
 -              while ( $rev && ( $rev->isDeleted( Revision::DELETED_TEXT )
 -                      || LinkFilter::matchEntry( $rev->getContent( Revision::RAW ), $domain, $protocol ) )
 +              while ( $rev && ( $rev->isDeleted( RevisionRecord::DELETED_TEXT )
 +                      || LinkFilter::matchEntry( $rev->getContent( RevisionRecord::RAW ), $domain, $protocol ) )
                ) {
                        $rev = $rev->getPrevious();
                }
@@@ -154,7 -152,7 +154,7 @@@
                        $page = WikiPage::factory( $title );
                        if ( $rev ) {
                                // Revert to this revision
 -                              $content = $rev->getContent( Revision::RAW );
 +                              $content = $rev->getContent( RevisionRecord::RAW );
  
                                $this->output( "reverting\n" );
                                $page->doEditContent(

diff --combined maintenance/includes/TextPassDumper.php
index c6738bc,8bc393f..f9b3951
--- 1/maintenance/includes/TextPassDumper.php
--- 2/maintenance/includes/TextPassDumper.php
+++ b/maintenance/includes/TextPassDumper.php
@@@ -373,13 -373,11 +373,13 @@@ TEX
                                $pageRatePart = '-';
                                $revRatePart = '-';
                        }
 +
 +                      $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
                        $this->progress( sprintf(
                                "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), "
                                        . "%d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% "
                                        . "prefetched (all|curr), ETA %s [max %d]",
 -                              $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate,
 +                              $now, $dbDomain, $this->ID, $this->pageCount, $pageRate,
                                $pageRatePart, $this->revCount, $revRate, $revRatePart,
                                $fetchRate, $fetchRatePart, $etats, $this->maxCount
                        ) );
@@@ -759,6 -757,7 +759,7 @@@
        function openSpawn() {
                global $IP;
  
+               $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
                if ( count( $this->php ) == 2 ) {
                        $mwscriptpath = $this->php[1];
                } else {
@@@ -771,14 -770,14 +772,14 @@@
                                                $this->php[0],
                                                $mwscriptpath,
                                                "fetchText.php",
-                                               '--wiki', wfWikiID() ] ) );
+                                               '--wiki', $wiki ] ) );
                } else {
                        $cmd = implode( " ",
                                array_map( [ Shell::class, 'escape' ],
                                        [
                                                $this->php[0],
                                                "$IP/maintenance/fetchText.php",
-                                               '--wiki', wfWikiID() ] ) );
+                                               '--wiki', $wiki ] ) );
                }
                $spec = [
                        0 => [ "pipe", "r" ],

diff --combined maintenance/storage/recompressTracked.php
index 8a8f4d8,50a4667..6fd53cc
--- 1/maintenance/storage/recompressTracked.php
--- 2/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@@ -148,7 -148,7 +148,7 @@@ class RecompressTracked 
                if ( $this->replicaId !== false ) {
                        $header .= "({$this->replicaId})";
                }
 -              $header .= ' ' . wfWikiID();
 +              $header .= ' ' . WikiMap::getCurrentWikiDbDomain()->getId();
                LegacyLogger::emit( sprintf( "%-50s %s\n", $header, $msg ), $file );
        }
  
@@@ -218,6 -218,8 +218,8 @@@
         * writing are all slow.
         */
        function startReplicaProcs() {
+               $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
+ 
                $cmd = 'php ' . Shell::escape( __FILE__ );
                foreach ( self::$cmdLineOptionMap as $cmdOption => $classOption ) {
                        if ( $cmdOption == 'replica-id' ) {
@@@ -229,7 -231,7 +231,7 @@@
                        }
                }
                $cmd .= ' --child' .
-                       ' --wiki ' . Shell::escape( wfWikiID() ) .
+                       ' --wiki ' . Shell::escape( $wiki ) .
                        ' ' . Shell::escape( ...$this->destClusters );
  
                $this->replicaPipes = $this->replicaProcs = [];