Merge "RevisionTest: Use utf-8 as name in iconv"

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

diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php
index 42c2dd4..7dd40b8 100644 (file)
--- a/maintenance/copyJobQueue.php
+++ b/maintenance/copyJobQueue.php
@@ -48,17 +48,17 @@ class CopyJobQueue extends Maintenance {
                $dstKey = $this->getOption( 'dst' );
 
                if ( !isset( $wgJobQueueMigrationConfig[$srcKey] ) ) {
-                       $this->error( "\$wgJobQueueMigrationConfig not set for '$srcKey'.", 1 );
+                       $this->fatalError( "\$wgJobQueueMigrationConfig not set for '$srcKey'." );
                } elseif ( !isset( $wgJobQueueMigrationConfig[$dstKey] ) ) {
-                       $this->error( "\$wgJobQueueMigrationConfig not set for '$dstKey'.", 1 );
+                       $this->fatalError( "\$wgJobQueueMigrationConfig not set for '$dstKey'." );
                }
 
                $types = ( $this->getOption( 'type' ) === 'all' )
                        ? JobQueueGroup::singleton()->getQueueTypes()
-                       : array( $this->getOption( 'type' ) );
+                       : [ $this->getOption( 'type' ) ];
 
                foreach ( $types as $type ) {
-                       $baseConfig = array( 'type' => $type, 'wiki' => wfWikiID() );
+                       $baseConfig = [ 'type' => $type, 'wiki' => wfWikiID() ];
                        $src = JobQueue::factory( $baseConfig + $wgJobQueueMigrationConfig[$srcKey] );
                        $dst = JobQueue::factory( $baseConfig + $wgJobQueueMigrationConfig[$dstKey] );
 
@@ -73,14 +73,14 @@ class CopyJobQueue extends Maintenance {
        protected function copyJobs( JobQueue $src, JobQueue $dst, $jobs ) {
                $total = 0;
                $totalOK = 0;
-               $batch = array();
+               $batch = [];
                foreach ( $jobs as $job ) {
                        ++$total;
                        $batch[] = $job;
-                       if ( count( $batch ) >= $this->mBatchSize ) {
+                       if ( count( $batch ) >= $this->getBatchSize() ) {
                                $dst->push( $batch );
                                $totalOK += count( $batch );
-                               $batch = array();
+                               $batch = [];
                                $dst->waitForBackups();
                        }
                }
@@ -90,7 +90,7 @@ class CopyJobQueue extends Maintenance {
                        $dst->waitForBackups();
                }
 
-               return array( $total, $totalOK );
+               return [ $total, $totalOK ];
        }
 }