From: Umherirrender Date: Fri, 8 Mar 2019 19:19:26 +0000 (+0100) Subject: Move class JobQueueAggregatorNull to own file X-Git-Tag: 1.34.0-rc.0~2601 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=d515f784e58b0bb7c2cd3d1f844094aafd5bc14a;p=lhc%2Fweb%2Fwiklou.git Move class JobQueueAggregatorNull to own file Change-Id: Icb76f25eb9c2a26c91ba564a78edd4c07b49b944 --- diff --git a/.phpcs.xml b/.phpcs.xml index b877c96647..5a639adb99 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -222,7 +222,6 @@ */includes/gallery/PackedOverlayImageGallery\.php */includes/HistoryBlob\.php */includes/htmlform/HTMLFormElement\.php - */includes/jobqueue/aggregator/JobQueueAggregator\.php */includes/libs/filebackend/FileBackendStore\.php */includes/libs/filebackend/FSFileBackend\.php */includes/libs/filebackend/SwiftFileBackend\.php diff --git a/autoload.php b/autoload.php index fab10fe5d2..be377373e9 100644 --- a/autoload.php +++ b/autoload.php @@ -705,7 +705,7 @@ $wgAutoloadLocalClasses = [ 'Job' => __DIR__ . '/includes/jobqueue/Job.php', 'JobQueue' => __DIR__ . '/includes/jobqueue/JobQueue.php', 'JobQueueAggregator' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregator.php', - 'JobQueueAggregatorNull' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregator.php', + 'JobQueueAggregatorNull' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorNull.php', 'JobQueueAggregatorRedis' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php', 'JobQueueConnectionError' => __DIR__ . '/includes/jobqueue/exception/JobQueueConnectionError.php', 'JobQueueDB' => __DIR__ . '/includes/jobqueue/JobQueueDB.php', diff --git a/includes/jobqueue/aggregator/JobQueueAggregator.php b/includes/jobqueue/aggregator/JobQueueAggregator.php index 27ad88e73d..b44fc456ff 100644 --- a/includes/jobqueue/aggregator/JobQueueAggregator.php +++ b/includes/jobqueue/aggregator/JobQueueAggregator.php @@ -157,24 +157,3 @@ abstract class JobQueueAggregator { return $pendingDBs; } } - -/** - * @ingroup JobQueue - */ -class JobQueueAggregatorNull extends JobQueueAggregator { - protected function doNotifyQueueEmpty( $wiki, $type ) { - return true; - } - - protected function doNotifyQueueNonEmpty( $wiki, $type ) { - return true; - } - - protected function doGetAllReadyWikiQueues() { - return []; - } - - protected function doPurge() { - return true; - } -} diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorNull.php b/includes/jobqueue/aggregator/JobQueueAggregatorNull.php new file mode 100644 index 0000000000..c44d70e07a --- /dev/null +++ b/includes/jobqueue/aggregator/JobQueueAggregatorNull.php @@ -0,0 +1,42 @@ +