X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcopyJobQueue.php;h=dc70e9c20329402687b548f4058e6c9bb9785a99;hb=f84721d9a51ecb6d89def9264b453f29743839b6;hp=42c2dd4d7703819ab8e4192ab26bc47a672dd97a;hpb=fb25d9fe77207c86d3f99934c74d5a0fa96ef0a2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php
index 42c2dd4d77..dc70e9c203 100644
--- 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,9 +90,9 @@ class CopyJobQueue extends Maintenance {
 			$dst->waitForBackups();
 		}
 
-		return array( $total, $totalOK );
+		return [ $total, $totalOK ];
 	}
 }
 
-$maintClass = 'CopyJobQueue';
+$maintClass = CopyJobQueue::class;
 require_once RUN_MAINTENANCE_IF_MAIN;