From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 3 Jun 2015 17:38:35 +0000 (+0000)
Subject: Merge "Let deduplicateRootJob() accept JobSpecification for consistency"
X-Git-Tag: 1.31.0-rc.0~11192
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=c3f5ee0973fba27bab9a50f83eb637de72f7c659;p=lhc%2Fweb%2Fwiklou.git

Merge "Let deduplicateRootJob() accept JobSpecification for consistency"
---

c3f5ee0973fba27bab9a50f83eb637de72f7c659
diff --cc includes/jobqueue/JobQueueRedis.php
index 2e20660118,b3ffa3c949..ea94226fef
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@@ -402,14 -400,13 +402,14 @@@ LUA
  
  	/**
  	 * @see JobQueue::doDeduplicateRootJob()
- 	 * @param Job $job
+ 	 * @param IJobSpecification $job
  	 * @return bool
 -	 * @throws MWException|JobQueueError
 +	 * @throws JobQueueError
 +	 * @throws LogicException
  	 */
- 	protected function doDeduplicateRootJob( Job $job ) {
+ 	protected function doDeduplicateRootJob( IJobSpecification $job ) {
  		if ( !$job->hasRootJobParams() ) {
 -			throw new MWException( "Cannot register root job; missing parameters." );
 +			throw new LogicException( "Cannot register root job; missing parameters." );
  		}
  		$params = $job->getRootJobParams();