Merge "mediawiki.util: Remove redundant file closures"

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index a9fe258..f0e0077 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -293,7 +293,6 @@ class ApiMain extends ApiBase {
                $this->mEnableWrite = $enableWrite;
 
                $this->mCdnMaxAge = -1; // flag for executeActionWithErrorHandling()
-               $this->mCommit = false;
        }
 
        /**

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 981aeb0..d5f5de3 100644 (file)
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -94,8 +94,7 @@ class LogPage {
 
                $dbw = wfGetDB( DB_MASTER );
 
-               // @todo FIXME private/protected/public property?
-               $this->timestamp = $now = wfTimestampNow();
+               $now = wfTimestampNow();
                $data = [
                        'log_type' => $this->type,
                        'log_action' => $this->action,

diff --git a/includes/specials/SpecialRecentChangesLinked.php b/includes/specials/SpecialRecentChangesLinked.php
index 8865654..26f3665 100644 (file)
--- a/includes/specials/SpecialRecentChangesLinked.php
+++ b/includes/specials/SpecialRecentChangesLinked.php
@@ -229,13 +229,7 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
                        $sql = $dbr->limitResult( $sql, $limit, false );
                }
 
-               $res = $dbr->query( $sql, __METHOD__ );
-
-               if ( $res->numRows() == 0 ) {
-                       $this->mResultEmpty = true;
-               }
-
-               return $res;
+               return $dbr->query( $sql, __METHOD__ );
        }
 
        function setTopText( FormOptions $opts ) {

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index eff8889..83153ae 100644 (file)
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -47,7 +47,6 @@ class SpecialStatistics extends SpecialPage {
                $this->total = SiteStats::pages();
                $this->users = SiteStats::users();
                $this->activeUsers = SiteStats::activeUsers();
-               $this->hook = '';
 
                $text = Xml::openElement( 'table', [ 'class' => 'wikitable mw-statistics-table' ] );
 

diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index c4ca056..40cac1b 100644 (file)
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -32,6 +32,9 @@ require_once __DIR__ . '/Maintenance.php';
  * @ingroup Maintenance
  */
 class DumpUploads extends Maintenance {
+       /** @var string */
+       private $mBasePath;
+
        public function __construct() {
                parent::__construct();
                $this->addDescription( 'Generates list of uploaded files which can be fed to tar or similar.
@@ -44,30 +47,29 @@ By default, outputs relative paths against the parent directory of $wgUploadDire
 
        public function execute() {
                global $IP;
-               $this->mAction = 'fetchLocal';
                $this->mBasePath = $this->getOption( 'base', $IP );
-               $this->mShared = false;
-               $this->mSharedSupplement = false;
-
-               if ( $this->hasOption( 'local' ) ) {
-                       $this->mAction = 'fetchLocal';
-               }
-
-               if ( $this->hasOption( 'used' ) ) {
-                       $this->mAction = 'fetchUsed';
-               }
+               $shared = false;
+               $sharedSupplement = false;
 
                if ( $this->hasOption( 'shared' ) ) {
                        if ( $this->hasOption( 'used' ) ) {
                                // Include shared-repo files in the used check
-                               $this->mShared = true;
+                               $shared = true;
                        } else {
                                // Grab all local *plus* used shared
-                               $this->mSharedSupplement = true;
+                               $sharedSupplement = true;
                        }
                }
-               $this->{$this->mAction} ( $this->mShared );
-               if ( $this->mSharedSupplement ) {
+
+               if ( $this->hasOption( 'local' ) ) {
+                       $this->fetchLocal( $shared );
+               } elseif ( $this->hasOption( 'used' ) ) {
+                       $this->fetchUsed( $shared );
+               } else {
+                       $this->fetchLocal( $shared );
+               }
+
+               if ( $sharedSupplement ) {
                        $this->fetchUsed( true );
                }
        }

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 48a6666..d78c5a0 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -129,7 +129,6 @@ class MergeMessageFileList extends Maintenance {
                $files = [];
                $fileLines = file( $fileName );
                if ( $fileLines === false ) {
-                       $this->hasError = true;
                        $this->error( "Unable to open list file $fileName." );
 
                        return $files;
@@ -144,7 +143,6 @@ class MergeMessageFileList extends Maintenance {
                                if ( file_exists( $extension ) ) {
                                        $files[] = $extension;
                                } else {
-                                       $this->hasError = true;
                                        $this->error( "Extension {$extension} doesn't exist" );
                                }
                        }