X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJob.php;h=37e3d0fa18a27dc6ec7c7585ec3b52b2edc7e2d1;hb=3b17287bb8d5ce18fa363c3d7c549323603541e9;hp=3e23391cdf0e488a9010351ae3837663b0b35da1;hpb=f7c0392b1ca1c4a117e9edda45fb5721b70f2a2b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php
index 3e23391cdf..37e3d0fa18 100644
--- a/includes/jobqueue/Job.php
+++ b/includes/jobqueue/Job.php
@@ -36,7 +36,7 @@ abstract class Job implements IJobSpecification {
 	public $params;
 
 	/** @var array Additional queue metadata */
-	public $metadata = array();
+	public $metadata = [];
 
 	/** @var Title */
 	protected $title;
@@ -62,14 +62,19 @@ abstract class Job implements IJobSpecification {
 	 * @throws MWException
 	 * @return Job
 	 */
-	public static function factory( $command, Title $title, $params = array() ) {
+	public static function factory( $command, Title $title, $params = [] ) {
 		global $wgJobClasses;
+
 		if ( isset( $wgJobClasses[$command] ) ) {
 			$class = $wgJobClasses[$command];
 
-			return new $class( $title, $params );
+			$job = new $class( $title, $params );
+			$job->command = $command;
+
+			return $job;
 		}
-		throw new MWException( "Invalid job command `{$command}`" );
+
+		throw new InvalidArgumentException( "Invalid job command '{$command}'" );
 	}
 
 	/**
@@ -80,7 +85,7 @@ abstract class Job implements IJobSpecification {
 	public function __construct( $command, $title, $params = false ) {
 		$this->command = $command;
 		$this->title = $title;
-		$this->params = is_array( $params ) ? $params : array(); // sanity
+		$this->params = is_array( $params ) ? $params : []; // sanity
 
 		// expensive jobs may set this to true
 		$this->removeDuplicates = false;
@@ -194,12 +199,12 @@ abstract class Job implements IJobSpecification {
 	 * @since 1.21
 	 */
 	public function getDeduplicationInfo() {
-		$info = array(
+		$info = [
 			'type' => $this->getType(),
 			'namespace' => $this->getTitle()->getNamespace(),
 			'title' => $this->getTitle()->getDBkey(),
 			'params' => $this->getParams()
-		);
+		];
 		if ( is_array( $info['params'] ) ) {
 			// Identical jobs with different "root" jobs should count as duplicates
 			unset( $info['params']['rootJobSignature'] );
@@ -233,11 +238,11 @@ abstract class Job implements IJobSpecification {
 	 * @since 1.21
 	 */
 	public static function newRootJobParams( $key ) {
-		return array(
+		return [
 			'rootJobIsSelf'    => true,
 			'rootJobSignature' => sha1( $key ),
 			'rootJobTimestamp' => wfTimestampNow()
-		);
+		];
 	}
 
 	/**
@@ -246,14 +251,14 @@ abstract class Job implements IJobSpecification {
 	 * @since 1.21
 	 */
 	public function getRootJobParams() {
-		return array(
+		return [
 			'rootJobSignature' => isset( $this->params['rootJobSignature'] )
 				? $this->params['rootJobSignature']
 				: null,
 			'rootJobTimestamp' => isset( $this->params['rootJobTimestamp'] )
 				? $this->params['rootJobTimestamp']
 				: null
-		);
+		];
 	}
 
 	/**
@@ -303,7 +308,7 @@ abstract class Job implements IJobSpecification {
 					$paramString .= ' ';
 				}
 				if ( is_array( $value ) ) {
-					$filteredValue = array();
+					$filteredValue = [];
 					foreach ( $value as $k => $v ) {
 						if ( is_scalar( $v ) ) {
 							$filteredValue[$k] = $truncFunc( $v );