X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueGroup.php;h=83e5fb24bff0deddba5bb3edacdc96a2107d25e9;hb=ac16588afe6b6067f2507b11f1025c0c339baab8;hp=4bac304d13f216bfd3aff784d16d1d3e879c9530;hpb=b306873222f91789e334abcf2005d4b610cfce91;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php
index 4bac304d13..756724e123 100644
--- a/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@ -31,7 +31,7 @@ class JobQueueGroup {
 	/** @var JobQueueGroup[] */
 	protected static $instances = [];
 
-	/** @var ProcessCacheLRU */
+	/** @var MapCacheLRU */
 	protected $cache;
 
 	/** @var string Wiki domain ID */
@@ -187,10 +187,6 @@ class JobQueueGroup {
 	/**
 	 * Buffer jobs for insertion via push() or call it now if in CLI mode
 	 *
-	 * Note that pushLazyJobs() is registered as a deferred update just before
-	 * DeferredUpdates::doUpdates() in MediaWiki and JobRunner classes in order
-	 * to be executed as the very last deferred update (T100085, T154425).
-	 *
 	 * @param IJobSpecification|IJobSpecification[] $jobs A single Job or a list of Jobs
 	 * @return void
 	 * @since 1.26
@@ -214,17 +210,6 @@ class JobQueueGroup {
 		DeferredUpdates::addUpdate( new JobQueueEnqueueUpdate( $this->domain, $jobs ) );
 	}
 
-	/**
-	 * Push all jobs buffered via lazyPush() into their respective queues
-	 *
-	 * @return void
-	 * @since 1.26
-	 * @deprecated Since 1.33 Not needed anymore
-	 */
-	public static function pushLazyJobs() {
-		wfDeprecated( __METHOD__, '1.33' );
-	}
-
 	/**
 	 * Pop a job off one of the job queues
 	 *
@@ -234,7 +219,7 @@ class JobQueueGroup {
 	 * @param int|string $qtype JobQueueGroup::TYPE_* constant or job type string
 	 * @param int $flags Bitfield of JobQueueGroup::USE_* constants
 	 * @param array $blacklist List of job types to ignore
-	 * @return Job|bool Returns false on failure
+	 * @return RunnableJob|bool Returns false on failure
 	 */
 	public function pop( $qtype = self::TYPE_DEFAULT, $flags = 0, array $blacklist = [] ) {
 		global $wgJobClasses;
@@ -286,10 +271,10 @@ class JobQueueGroup {
 	/**
 	 * Acknowledge that a job was completed
 	 *
-	 * @param Job $job
+	 * @param RunnableJob $job
 	 * @return void
 	 */
-	public function ack( Job $job ) {
+	public function ack( RunnableJob $job ) {
 		$this->get( $job->getType() )->ack( $job );
 	}
 
@@ -297,10 +282,10 @@ class JobQueueGroup {
 	 * Register the "root job" of a given job into the queue for de-duplication.
 	 * This should only be called right *after* all the new jobs have been inserted.
 	 *
-	 * @param Job $job
+	 * @param RunnableJob $job
 	 * @return bool
 	 */
-	public function deduplicateRootJob( Job $job ) {
+	public function deduplicateRootJob( RunnableJob $job ) {
 		return $this->get( $job->getType() )->deduplicateRootJob( $job );
 	}