From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 17 Dec 2013 08:26:57 +0000 (-0800)
Subject: Remove unused job ID parameter from jobs
X-Git-Tag: 1.31.0-rc.0~17605^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=e455c46fad1c60b89181700c48d43a1882d6643a;p=lhc%2Fweb%2Fwiklou.git

Remove unused job ID parameter from jobs

Change-Id: I2bedd0ff311bff027d998f193d6cb799d70d2a93
---

diff --git a/includes/job/Job.php b/includes/job/Job.php
index f08a3677a1..77652a4d4e 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -66,16 +66,15 @@ abstract class Job {
 	 * @param string $command Job command
 	 * @param Title $title Associated title
 	 * @param array|bool $params Job parameters
-	 * @param int $id Job identifier
 	 * @throws MWException
 	 * @return Job
 	 */
-	public static function factory( $command, Title $title, $params = false, $id = 0 ) {
+	public static function factory( $command, Title $title, $params = false ) {
 		global $wgJobClasses;
 		if ( isset( $wgJobClasses[$command] ) ) {
 			$class = $wgJobClasses[$command];
 
-			return new $class( $title, $params, $id );
+			return new $class( $title, $params );
 		}
 		throw new MWException( "Invalid job command `{$command}`" );
 	}
diff --git a/includes/job/jobs/AssembleUploadChunksJob.php b/includes/job/jobs/AssembleUploadChunksJob.php
index eff16b945a..19b05586d4 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -27,8 +27,8 @@
  * @ingroup Upload
  */
 class AssembleUploadChunksJob extends Job {
-	public function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'AssembleUploadChunks', $title, $params, $id );
+	public function __construct( $title, $params ) {
+		parent::__construct( 'AssembleUploadChunks', $title, $params );
 		$this->removeDuplicates = true;
 	}
 
diff --git a/includes/job/jobs/DoubleRedirectJob.php b/includes/job/jobs/DoubleRedirectJob.php
index f5f0d6329a..99d7527486 100644
--- a/includes/job/jobs/DoubleRedirectJob.php
+++ b/includes/job/jobs/DoubleRedirectJob.php
@@ -86,8 +86,8 @@ class DoubleRedirectJob extends Job {
 	 * @param array|bool $params
 	 * @param int $id
 	 */
-	function __construct( $title, $params = false, $id = 0 ) {
-		parent::__construct( 'fixDoubleRedirect', $title, $params, $id );
+	function __construct( $title, $params = false ) {
+		parent::__construct( 'fixDoubleRedirect', $title, $params );
 		$this->reason = $params['reason'];
 		$this->redirTitle = Title::newFromText( $params['redirTitle'] );
 	}
diff --git a/includes/job/jobs/EmaillingJob.php b/includes/job/jobs/EmaillingJob.php
index f24cebb622..df8ae63edf 100644
--- a/includes/job/jobs/EmaillingJob.php
+++ b/includes/job/jobs/EmaillingJob.php
@@ -28,8 +28,8 @@
  * @ingroup JobQueue
  */
 class EmaillingJob extends Job {
-	function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'sendMail', Title::newMainPage(), $params, $id );
+	function __construct( $title, $params ) {
+		parent::__construct( 'sendMail', Title::newMainPage(), $params );
 	}
 
 	function run() {
diff --git a/includes/job/jobs/EnotifNotifyJob.php b/includes/job/jobs/EnotifNotifyJob.php
index 97a7af6b39..1ed99a58ab 100644
--- a/includes/job/jobs/EnotifNotifyJob.php
+++ b/includes/job/jobs/EnotifNotifyJob.php
@@ -27,8 +27,8 @@
  * @ingroup JobQueue
  */
 class EnotifNotifyJob extends Job {
-	function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'enotifNotify', $title, $params, $id );
+	function __construct( $title, $params ) {
+		parent::__construct( 'enotifNotify', $title, $params );
 	}
 
 	function run() {
diff --git a/includes/job/jobs/HTMLCacheUpdateJob.php b/includes/job/jobs/HTMLCacheUpdateJob.php
index 04159068ab..833616dbbe 100644
--- a/includes/job/jobs/HTMLCacheUpdateJob.php
+++ b/includes/job/jobs/HTMLCacheUpdateJob.php
@@ -33,8 +33,8 @@
  * @ingroup JobQueue
  */
 class HTMLCacheUpdateJob extends Job {
-	function __construct( $title, $params = '', $id = 0 ) {
-		parent::__construct( 'htmlCacheUpdate', $title, $params, $id );
+	function __construct( $title, $params = '' ) {
+		parent::__construct( 'htmlCacheUpdate', $title, $params );
 		// Base backlink purge jobs can be de-duplicated
 		$this->removeDuplicates = ( !isset( $params['range'] ) && !isset( $params['pages'] ) );
 	}
diff --git a/includes/job/jobs/NullJob.php b/includes/job/jobs/NullJob.php
index f62419cbb0..1da00a1d0a 100644
--- a/includes/job/jobs/NullJob.php
+++ b/includes/job/jobs/NullJob.php
@@ -50,8 +50,8 @@ class NullJob extends Job {
 	 * @param array $params job parameters (lives, usleep)
 	 * @param int $id Job id
 	 */
-	function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'null', $title, $params, $id );
+	function __construct( $title, $params ) {
+		parent::__construct( 'null', $title, $params );
 		if ( !isset( $this->params['lives'] ) ) {
 			$this->params['lives'] = 1;
 		}
diff --git a/includes/job/jobs/PublishStashedFileJob.php b/includes/job/jobs/PublishStashedFileJob.php
index 88ac9cfffd..d7667f390a 100644
--- a/includes/job/jobs/PublishStashedFileJob.php
+++ b/includes/job/jobs/PublishStashedFileJob.php
@@ -27,8 +27,8 @@
  * @ingroup Upload
  */
 class PublishStashedFileJob extends Job {
-	public function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'PublishStashedFile', $title, $params, $id );
+	public function __construct( $title, $params ) {
+		parent::__construct( 'PublishStashedFile', $title, $params );
 		$this->removeDuplicates = true;
 	}
 
diff --git a/includes/job/jobs/RefreshLinksJob.php b/includes/job/jobs/RefreshLinksJob.php
index c94db75a80..d8526ee09b 100644
--- a/includes/job/jobs/RefreshLinksJob.php
+++ b/includes/job/jobs/RefreshLinksJob.php
@@ -35,8 +35,8 @@
  * @ingroup JobQueue
  */
 class RefreshLinksJob extends Job {
-	function __construct( $title, $params = '', $id = 0 ) {
-		parent::__construct( 'refreshLinks', $title, $params, $id );
+	function __construct( $title, $params = '' ) {
+		parent::__construct( 'refreshLinks', $title, $params );
 		// Base backlink update jobs and per-title update jobs can be de-duplicated.
 		// If template A changes twice before any jobs run, a clean queue will have:
 		//		(A base, A base)
diff --git a/includes/job/jobs/RefreshLinksJob2.php b/includes/job/jobs/RefreshLinksJob2.php
index 332f625789..77e3b3f199 100644
--- a/includes/job/jobs/RefreshLinksJob2.php
+++ b/includes/job/jobs/RefreshLinksJob2.php
@@ -29,8 +29,8 @@
  * @deprecated 1.23
  */
 class RefreshLinksJob2 extends Job {
-	function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'refreshLinks2', $title, $params, $id );
+	function __construct( $title, $params ) {
+		parent::__construct( 'refreshLinks2', $title, $params );
 		// Base jobs for large templates can easily be de-duplicated
 		$this->removeDuplicates = !isset( $params['start'] ) && !isset( $params['end'] );
 	}
diff --git a/includes/job/jobs/UploadFromUrlJob.php b/includes/job/jobs/UploadFromUrlJob.php
index 15d523f261..2cdac57e5e 100644
--- a/includes/job/jobs/UploadFromUrlJob.php
+++ b/includes/job/jobs/UploadFromUrlJob.php
@@ -39,8 +39,8 @@ class UploadFromUrlJob extends Job {
 	/** @var User */
 	protected $user;
 
-	public function __construct( $title, $params, $id = 0 ) {
-		parent::__construct( 'uploadFromUrl', $title, $params, $id );
+	public function __construct( $title, $params ) {
+		parent::__construct( 'uploadFromUrl', $title, $params );
 	}
 
 	public function run() {