Update IPSet use statements

[lhc/web/wiklou.git] / maintenance / populateImageSha1.php

diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php
index 51cc72a..84b65ee 100644 (file)
--- a/maintenance/populateImageSha1.php
+++ b/maintenance/populateImageSha1.php
@@ -71,32 +71,30 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance {
                if ( $file != '' ) {
                        $res = $dbw->select(
                                'image',
-                               array( 'img_name' ),
-                               array( 'img_name' => $file ),
+                               [ 'img_name' ],
+                               [ 'img_name' => $file ],
                                __METHOD__
                        );
                        if ( !$res ) {
-                               $this->error( "No such file: $file", true );
-
-                               return false;
+                               $this->fatalError( "No such file: $file" );
                        }
                        $this->output( "Populating img_sha1 field for specified files\n" );
                } else {
                        if ( $this->hasOption( 'multiversiononly' ) ) {
-                               $conds = array();
+                               $conds = [];
                                $this->output( "Populating and recalculating img_sha1 field for versioned files\n" );
                        } elseif ( $force ) {
-                               $conds = array();
+                               $conds = [];
                                $this->output( "Populating and recalculating img_sha1 field\n" );
                        } else {
-                               $conds = array( 'img_sha1' => '' );
+                               $conds = [ 'img_sha1' => '' ];
                                $this->output( "Populating img_sha1 field\n" );
                        }
                        if ( $this->hasOption( 'multiversiononly' ) ) {
                                $res = $dbw->select( 'oldimage',
-                                       array( 'img_name' => 'DISTINCT(oi_name)' ), $conds, __METHOD__ );
+                                       [ 'img_name' => 'DISTINCT(oi_name)' ], $conds, __METHOD__ );
                        } else {
-                               $res = $dbw->select( 'image', array( 'img_name' ), $conds, __METHOD__ );
+                               $res = $dbw->select( 'image', [ 'img_name' ], $conds, __METHOD__ );
                        }
                }
 
@@ -119,7 +117,7 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance {
                $numRows = $res->numRows();
                $i = 0;
                foreach ( $res as $row ) {
-                       if ( $i % $this->mBatchSize == 0 ) {
+                       if ( $i % $this->getBatchSize() == 0 ) {
                                $this->output( sprintf(
                                        "Done %d of %d, %5.3f%%  \r", $i, $numRows, $i / $numRows * 100 ) );
                                wfWaitForSlaves();