X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fjobqueue%2FJobQueueTest.php;h=7b34b59b152182ba1be3bbfd30f9457b1df41a58;hb=a7c3aaccba03062e8b27ff378e74619e339325ba;hp=47277d96766f6cc1eb906a5c150c70da98735cc6;hpb=f2c242e2e8d86d6d12ae9c160b88c43558306d8f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 47277d9676..7b34b59b15 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -9,7 +9,7 @@ class JobQueueTest extends MediaWikiTestCase {
 	protected $key;
 	protected $queueRand, $queueRandTTL, $queueFifo, $queueFifoTTL;
 
-	function __construct( $name = null, array $data = array(), $dataName = '' ) {
+	function __construct( $name = null, array $data = [], $dataName = '' ) {
 		parent::__construct( $name, $data, $dataName );
 
 		$this->tablesUsed[] = 'job';
@@ -26,18 +26,18 @@ class JobQueueTest extends MediaWikiTestCase {
 			}
 			$baseConfig = $wgJobTypeConf[$name];
 		} else {
-			$baseConfig = array( 'class' => 'JobQueueDB' );
+			$baseConfig = [ 'class' => 'JobQueueDB' ];
 		}
 		$baseConfig['type'] = 'null';
 		$baseConfig['wiki'] = wfWikiID();
-		$variants = array(
-			'queueRand' => array( 'order' => 'random', 'claimTTL' => 0 ),
-			'queueRandTTL' => array( 'order' => 'random', 'claimTTL' => 10 ),
-			'queueTimestamp' => array( 'order' => 'timestamp', 'claimTTL' => 0 ),
-			'queueTimestampTTL' => array( 'order' => 'timestamp', 'claimTTL' => 10 ),
-			'queueFifo' => array( 'order' => 'fifo', 'claimTTL' => 0 ),
-			'queueFifoTTL' => array( 'order' => 'fifo', 'claimTTL' => 10 ),
-		);
+		$variants = [
+			'queueRand' => [ 'order' => 'random', 'claimTTL' => 0 ],
+			'queueRandTTL' => [ 'order' => 'random', 'claimTTL' => 10 ],
+			'queueTimestamp' => [ 'order' => 'timestamp', 'claimTTL' => 0 ],
+			'queueTimestampTTL' => [ 'order' => 'timestamp', 'claimTTL' => 10 ],
+			'queueFifo' => [ 'order' => 'fifo', 'claimTTL' => 0 ],
+			'queueFifoTTL' => [ 'order' => 'fifo', 'claimTTL' => 10 ],
+		];
 		foreach ( $variants as $q => $settings ) {
 			try {
 				$this->$q = JobQueue::factory( $settings + $baseConfig );
@@ -51,10 +51,10 @@ class JobQueueTest extends MediaWikiTestCase {
 	protected function tearDown() {
 		parent::tearDown();
 		foreach (
-			array(
+			[
 				'queueRand', 'queueRandTTL', 'queueTimestamp', 'queueTimestampTTL',
 				'queueFifo', 'queueFifoTTL'
-			) as $q
+			] as $q
 		) {
 			if ( $this->$q ) {
 				$this->$q->delete();
@@ -104,7 +104,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" );
 
 		$this->assertNull( $queue->push( $this->newJob() ), "Push worked ($desc)" );
-		$this->assertNull( $queue->batchPush( array( $this->newJob() ) ), "Push worked ($desc)" );
+		$this->assertNull( $queue->batchPush( [ $this->newJob() ] ), "Push worked ($desc)" );
 
 		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
 
@@ -146,7 +146,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$queue->flushCaches();
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
 
-		$this->assertNull( $queue->batchPush( array( $this->newJob(), $this->newJob() ) ),
+		$this->assertNull( $queue->batchPush( [ $this->newJob(), $this->newJob() ] ),
 			"Push worked ($desc)" );
 		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
 
@@ -174,7 +174,7 @@ class JobQueueTest extends MediaWikiTestCase {
 
 		$this->assertNull(
 			$queue->batchPush(
-				array( $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() )
+				[ $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() ]
 			),
 			"Push worked ($desc)" );
 
@@ -186,7 +186,7 @@ class JobQueueTest extends MediaWikiTestCase {
 
 		$this->assertNull(
 			$queue->batchPush(
-				array( $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() )
+				[ $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() ]
 			),
 			"Push worked ($desc)"
 		);
@@ -278,7 +278,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" );
 
 		$dupcount = 0;
-		$jobs = array();
+		$jobs = [];
 		do {
 			$job = $queue->pop();
 			if ( $job ) {
@@ -339,7 +339,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		}
 
 		$this->assertNotContains(
-			array( $queue->getType(), $queue->getWiki() ),
+			[ $queue->getType(), $queue->getWiki() ],
 			$queue->getServerQueuesWithJobs(),
 			"Null queue not in listing"
 		);
@@ -347,37 +347,37 @@ class JobQueueTest extends MediaWikiTestCase {
 		$queue->push( $this->newJob( 0 ) );
 
 		$this->assertContains(
-			array( $queue->getType(), $queue->getWiki() ),
+			[ $queue->getType(), $queue->getWiki() ],
 			$queue->getServerQueuesWithJobs(),
 			"Null queue in listing"
 		);
 	}
 
 	public static function provider_queueLists() {
-		return array(
-			array( 'queueRand', false, 'Random queue without ack()' ),
-			array( 'queueRandTTL', true, 'Random queue with ack()' ),
-			array( 'queueTimestamp', false, 'Time ordered queue without ack()' ),
-			array( 'queueTimestampTTL', true, 'Time ordered queue with ack()' ),
-			array( 'queueFifo', false, 'FIFO ordered queue without ack()' ),
-			array( 'queueFifoTTL', true, 'FIFO ordered queue with ack()' )
-		);
+		return [
+			[ 'queueRand', false, 'Random queue without ack()' ],
+			[ 'queueRandTTL', true, 'Random queue with ack()' ],
+			[ 'queueTimestamp', false, 'Time ordered queue without ack()' ],
+			[ 'queueTimestampTTL', true, 'Time ordered queue with ack()' ],
+			[ 'queueFifo', false, 'FIFO ordered queue without ack()' ],
+			[ 'queueFifoTTL', true, 'FIFO ordered queue with ack()' ]
+		];
 	}
 
 	public static function provider_fifoQueueLists() {
-		return array(
-			array( 'queueFifo', false, 'Ordered queue without ack()' ),
-			array( 'queueFifoTTL', true, 'Ordered queue with ack()' )
-		);
+		return [
+			[ 'queueFifo', false, 'Ordered queue without ack()' ],
+			[ 'queueFifoTTL', true, 'Ordered queue with ack()' ]
+		];
 	}
 
-	function newJob( $i = 0, $rootJob = array() ) {
+	function newJob( $i = 0, $rootJob = [] ) {
 		return new NullJob( Title::newMainPage(),
-			array( 'lives' => 0, 'usleep' => 0, 'removeDuplicates' => 0, 'i' => $i ) + $rootJob );
+			[ 'lives' => 0, 'usleep' => 0, 'removeDuplicates' => 0, 'i' => $i ] + $rootJob );
 	}
 
-	function newDedupedJob( $i = 0, $rootJob = array() ) {
+	function newDedupedJob( $i = 0, $rootJob = [] ) {
 		return new NullJob( Title::newMainPage(),
-			array( 'lives' => 0, 'usleep' => 0, 'removeDuplicates' => 1, 'i' => $i ) + $rootJob );
+			[ 'lives' => 0, 'usleep' => 0, 'removeDuplicates' => 1, 'i' => $i ] + $rootJob );
 	}
 }