Merge "jobqueue: remove entire unused JobQueueAggregator class hierarchy"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Apr 2019 17:43:31 +0000 (17:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Apr 2019 17:43:31 +0000 (17:43 +0000)
1  2 
autoload.php
includes/jobqueue/JobQueue.php
includes/jobqueue/JobQueueDB.php
includes/jobqueue/JobQueueGroup.php

diff --cc autoload.php
Simple merge
@@@ -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;
        }
  
Simple merge
Simple merge