From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 3 Apr 2019 17:43:31 +0000 (+0000)
Subject: Merge "jobqueue: remove entire unused JobQueueAggregator class hierarchy"
X-Git-Tag: 1.34.0-rc.0~2185
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=f28f7a0d0f322b299dd3cdd3b7b02a364b269958;p=lhc%2Fweb%2Fwiklou.git

Merge "jobqueue: remove entire unused JobQueueAggregator class hierarchy"
---

f28f7a0d0f322b299dd3cdd3b7b02a364b269958
diff --cc includes/jobqueue/JobQueue.php
index c9f17cf54c,9f78fb8d27..8cfed3b149
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@@ -66,10 -64,9 +64,9 @@@ abstract class JobQueue 
  			$this->order = $this->optimalOrder();
  		}
  		if ( !in_array( $this->order, $this->supportedOrders() ) ) {
 -			throw new MWException( __CLASS__ . " does not support '{$this->order}' order." );
 +			throw new JobQueueError( __CLASS__ . " does not support '{$this->order}' order." );
  		}
  		$this->dupCache = wfGetCache( CACHE_ANYTHING );
- 		$this->aggr = $params['aggregator'] ?? new JobQueueAggregatorNull( [] );
  		$this->readOnlyReason = $params['readOnlyReason'] ?? false;
  	}