Merge "Avoid usage of deprecated setTags() method, use addTags() instead"

diff --combined includes/FileDeleteForm.php
index 56cfd59,b5333af..75eedcc
--- 1/includes/FileDeleteForm.php
--- 2/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@@ -181,7 -181,7 +181,7 @@@ class FileDeleteForm 
                                $logEntry->setPerformer( $user );
                                $logEntry->setTarget( $title );
                                $logEntry->setComment( $logComment );
-                               $logEntry->setTags( $tags );
+                               $logEntry->addTags( $tags );
                                $logid = $logEntry->insert();
                                $logEntry->publish( $logid );
  
@@@ -212,7 -212,7 +212,7 @@@
                                                $logEntry->setPerformer( $user );
                                                $logEntry->setTarget( clone $title );
                                                $logEntry->setComment( $reason );
-                                               $logEntry->setTags( $tags );
+                                               $logEntry->addTags( $tags );
                                                $logid = $logEntry->insert();
                                                $dbw->onTransactionPreCommitOrIdle(
                                                        function () use ( $logEntry, $logid ) {
@@@ -261,7 -261,6 +261,7 @@@
                );
                $options = Xml::listDropDownOptionsOoui( $options );
  
 +              $fields = [];
                $fields[] = new OOUI\LabelWidget( [ 'label' => new OOUI\HtmlSnippet(
                        $this->prepareMessage( 'filedelete-intro' ) ) ]
                );

diff --combined includes/MovePage.php
index 5f2aceb,9f01893..4180e32
--- 1/includes/MovePage.php
--- 2/includes/MovePage.php
+++ b/includes/MovePage.php
@@@ -446,7 -446,7 +446,7 @@@ class MovePage 
                                $status = Status::newFatal( 'movepage-max-pages', $wgMaximumMovedPages );
                                $perTitleStatus[$oldSubpage->getPrefixedText()] = $status;
                                $topStatus->merge( $status );
 -                              $topStatus->setOk( true );
 +                              $topStatus->setOK( true );
                                break;
                        }
  
@@@ -479,7 -479,7 +479,7 @@@
                        }
                        $perTitleStatus[$oldSubpage->getPrefixedText()] = $status;
                        $topStatus->merge( $status );
 -                      $topStatus->setOk( true );
 +                      $topStatus->setOK( true );
                }
  
                $topStatus->value = $perTitleStatus;
@@@ -598,7 -598,7 +598,7 @@@
                                '4::oldtitle' => $this->oldTitle->getPrefixedText(),
                        ] );
                        $logEntry->setRelations( [ 'pr_id' => $logRelationsValues ] );
-                       $logEntry->setTags( $changeTags );
+                       $logEntry->addTags( $changeTags );
                        $logId = $logEntry->insert();
                        $logEntry->publish( $logId );
                }
@@@ -895,7 -895,7 +895,7 @@@
                # Log the move
                $logid = $logEntry->insert();
  
-               $logEntry->setTags( $changeTags );
+               $logEntry->addTags( $changeTags );
                $logEntry->publish( $logid );
  
                return $nullRevision;

diff --combined includes/filerepo/file/LocalFile.php
index cd789d9,3fe7889..0ef6034
--- 1/includes/filerepo/file/LocalFile.php
--- 2/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@@ -344,7 -344,6 +344,7 @@@ class LocalFile extends File 
                                $this->loadFromDB( self::READ_NORMAL );
  
                                $fields = $this->getCacheFields( '' );
 +                              $cacheVal = [];
                                $cacheVal['fileExists'] = $this->fileExists;
                                if ( $this->fileExists ) {
                                        foreach ( $fields as $field ) {
@@@ -1080,7 -1079,6 +1080,7 @@@
        /**
         * Delete cached transformed files for the current version only.
         * @param array $options
 +       * @phan-param array{forThumbRefresh?:bool} $options
         */
        public function purgeThumbnails( $options = [] ) {
                $files = $this->getThumbnails();
@@@ -1092,7 -1090,6 +1092,7 @@@
                array_shift( $urls ); // don't purge directory
  
                // Give media handler a chance to filter the file purge list
 +              // @phan-suppress-next-line PhanTypeInvalidDimOffset
                if ( !empty( $options['forThumbRefresh'] ) ) {
                        $handler = $this->getHandler();
                        if ( $handler ) {
@@@ -1761,7 -1758,7 +1761,7 @@@
  
                                        # Add change tags, if any
                                        if ( $tags ) {
-                                               $logEntry->setTags( $tags );
+                                               $logEntry->addTags( $tags );
                                        }
  
                                        # Uploads can be patrolled
@@@ -1926,9 -1923,10 +1926,9 @@@
  
                wfDebugLog( 'imagemove', "Finished moving {$this->name}" );
  
 -              // Purge the source and target files...
 +              // Purge the source and target files outside the transaction...
                $oldTitleFile = $localRepo->newFile( $this->title );
                $newTitleFile = $localRepo->newFile( $target );
 -              // To avoid slow purges in the transaction, move them outside...
                DeferredUpdates::addUpdate(
                        new AutoCommitUpdate(
                                $this->getRepo()->getMasterDB(),
@@@ -1936,7 -1934,6 +1936,7 @@@
                                function () use ( $oldTitleFile, $newTitleFile, $archiveNames ) {
                                        $oldTitleFile->purgeEverything();
                                        foreach ( $archiveNames as $archiveName ) {
 +                                              /** @var OldLocalFile $oldTitleFile */
                                                $oldTitleFile->purgeOldThumbnails( $archiveName );
                                        }
                                        $newTitleFile->purgeEverything();
@@@ -1949,8 -1946,8 +1949,8 @@@
                        // Now switch the object
                        $this->title = $target;
                        // Force regeneration of the name and hashpath
 -                      unset( $this->name );
 -                      unset( $this->hashPath );
 +                      $this->name = null;
 +                      $this->hashPath = null;
                }
  
                return $status;

diff --combined includes/page/WikiPage.php
index b4b5927,a490cfd..4f0f2e2
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -68,9 -68,7 +68,9 @@@ class WikiPage implements Page, IDBAcce
         */
        public $mLatest = false;
  
 -      /** @var PreparedEdit Map of cache fields (text, parser output, ect) for a proposed/new edit */
 +      /**
 +       * @var PreparedEdit|false Map of cache fields (text, parser output, ect) for a proposed/new edit
 +       */
        public $mPreparedEdit = false;
  
        /**
@@@ -2392,7 -2390,7 +2392,7 @@@
                if ( !is_null( $nullRevision ) ) {
                        $logEntry->setAssociatedRevId( $nullRevision->getId() );
                }
-               $logEntry->setTags( $tags );
+               $logEntry->addTags( $tags );
                if ( $logRelationsField !== null && count( $logRelationsValues ) ) {
                        $logEntry->setRelations( [ $logRelationsField => $logRelationsValues ] );
                }
@@@ -2793,7 -2791,7 +2793,7 @@@
                        $logEntry->setPerformer( $deleter );
                        $logEntry->setTarget( $logTitle );
                        $logEntry->setComment( $reason );
-                       $logEntry->setTags( $tags );
+                       $logEntry->addTags( $tags );
                        $logid = $logEntry->insert();
  
                        $dbw->onTransactionPreCommitOrIdle(

diff --combined includes/specials/helpers/ImportReporter.php
index 0ae708a,eac48fa..938b159
--- 1/includes/specials/helpers/ImportReporter.php
--- 2/includes/specials/helpers/ImportReporter.php
+++ b/includes/specials/helpers/ImportReporter.php
@@@ -30,9 -30,6 +30,9 @@@ class ImportReporter extends ContextSou
        private $mOriginalLogCallback = null;
        private $mOriginalPageOutCallback = null;
        private $mLogItemCount = 0;
 +      private $mPageCount;
 +      private $mIsUpload;
 +      private $mInterwiki;
  
        /**
         * @param WikiImporter $importer
@@@ -163,7 -160,7 +163,7 @@@
                        // Make sure the null revision will be tagged as well
                        $logEntry->setAssociatedRevId( $nullRevId );
                        if ( count( $this->logTags ) ) {
-                               $logEntry->setTags( $this->logTags );
+                               $logEntry->addTags( $this->logTags );
                        }
                        $logid = $logEntry->insert();
                        $logEntry->publish( $logid );