From: Aaron Schulz Date: Thu, 21 May 2015 18:02:35 +0000 (-0700) Subject: Fixed Job constructor IDE notices about variable types X-Git-Tag: 1.31.0-rc.0~11253 X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=9632223e4cf501780b517b224fa5f0e8c4a2ad79;p=lhc%2Fweb%2Fwiklou.git Fixed Job constructor IDE notices about variable types Change-Id: I4b4e4e38e8d416c3445c52ced311f5fbfcde868a --- diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php index f8de0b5d3c..87bd836d16 100644 --- a/includes/jobqueue/Job.php +++ b/includes/jobqueue/Job.php @@ -32,7 +32,7 @@ abstract class Job implements IJobSpecification { /** @var string */ public $command; - /** @var array|bool Array of job parameters or false if none */ + /** @var array Array of job parameters */ public $params; /** @var array Additional queue metadata */ @@ -58,11 +58,11 @@ abstract class Job implements IJobSpecification { * * @param string $command Job command * @param Title $title Associated title - * @param array|bool $params Job parameters + * @param array $params Job parameters * @throws MWException * @return Job */ - public static function factory( $command, Title $title, $params = false ) { + public static function factory( $command, Title $title, $params = array() ) { global $wgJobClasses; if ( isset( $wgJobClasses[$command] ) ) { $class = $wgJobClasses[$command]; @@ -80,7 +80,7 @@ abstract class Job implements IJobSpecification { public function __construct( $command, $title, $params = false ) { $this->command = $command; $this->title = $title; - $this->params = $params; + $this->params = is_array( $params ) ? $params : array(); // sanity // expensive jobs may set this to true $this->removeDuplicates = false; diff --git a/includes/jobqueue/jobs/ActivityUpdateJob.php b/includes/jobqueue/jobs/ActivityUpdateJob.php index 495bda995b..f146e6e8bc 100644 --- a/includes/jobqueue/jobs/ActivityUpdateJob.php +++ b/includes/jobqueue/jobs/ActivityUpdateJob.php @@ -27,7 +27,7 @@ * @since 1.26 */ class ActivityUpdateJob extends Job { - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'activityUpdateJob', $title, $params ); if ( !isset( $params['type'] ) ) { diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php index b7f09e7768..a1de77e63b 100644 --- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php +++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php @@ -27,7 +27,7 @@ * @ingroup Upload */ class AssembleUploadChunksJob extends Job { - public function __construct( $title, $params ) { + public function __construct( Title $title, array $params ) { parent::__construct( 'AssembleUploadChunks', $title, $params ); $this->removeDuplicates = true; } diff --git a/includes/jobqueue/jobs/DoubleRedirectJob.php b/includes/jobqueue/jobs/DoubleRedirectJob.php index 2561f2f198..ab638967e4 100644 --- a/includes/jobqueue/jobs/DoubleRedirectJob.php +++ b/includes/jobqueue/jobs/DoubleRedirectJob.php @@ -40,6 +40,16 @@ class DoubleRedirectJob extends Job { /** @var User */ private static $user; + /** + * @param Title $title + * @param array $params + */ + function __construct( Title $title, array $params ) { + parent::__construct( 'fixDoubleRedirect', $title, $params ); + $this->reason = $params['reason']; + $this->redirTitle = Title::newFromText( $params['redirTitle'] ); + } + /** * Insert jobs into the job queue to fix redirects to the given title * @param string $reason The reason for the fix, see message @@ -81,16 +91,6 @@ class DoubleRedirectJob extends Job { JobQueueGroup::singleton()->push( $jobs ); } - /** - * @param Title $title - * @param array|bool $params - */ - function __construct( $title, $params = false ) { - parent::__construct( 'fixDoubleRedirect', $title, $params ); - $this->reason = $params['reason']; - $this->redirTitle = Title::newFromText( $params['redirTitle'] ); - } - /** * @return bool */ diff --git a/includes/jobqueue/jobs/DuplicateJob.php b/includes/jobqueue/jobs/DuplicateJob.php index c5e3a23401..068d5319ed 100644 --- a/includes/jobqueue/jobs/DuplicateJob.php +++ b/includes/jobqueue/jobs/DuplicateJob.php @@ -33,7 +33,7 @@ final class DuplicateJob extends Job { * @param Title $title * @param array $params Job parameters */ - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'duplicate', $title, $params ); } diff --git a/includes/jobqueue/jobs/EmaillingJob.php b/includes/jobqueue/jobs/EmaillingJob.php index df8ae63edf..68e96fcf31 100644 --- a/includes/jobqueue/jobs/EmaillingJob.php +++ b/includes/jobqueue/jobs/EmaillingJob.php @@ -28,7 +28,7 @@ * @ingroup JobQueue */ class EmaillingJob extends Job { - function __construct( $title, $params ) { + function __construct( Title $title = null, array $params ) { parent::__construct( 'sendMail', Title::newMainPage(), $params ); } diff --git a/includes/jobqueue/jobs/EnotifNotifyJob.php b/includes/jobqueue/jobs/EnotifNotifyJob.php index 1ed99a58ab..9a5c3c723c 100644 --- a/includes/jobqueue/jobs/EnotifNotifyJob.php +++ b/includes/jobqueue/jobs/EnotifNotifyJob.php @@ -27,7 +27,7 @@ * @ingroup JobQueue */ class EnotifNotifyJob extends Job { - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'enotifNotify', $title, $params ); } diff --git a/includes/jobqueue/jobs/EnqueueJob.php b/includes/jobqueue/jobs/EnqueueJob.php index 4514e19969..ca597ca9bb 100755 --- a/includes/jobqueue/jobs/EnqueueJob.php +++ b/includes/jobqueue/jobs/EnqueueJob.php @@ -40,7 +40,7 @@ final class EnqueueJob extends Job { * @param Title $title * @param array $params Job parameters */ - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'enqueue', $title, $params ); } diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php index e5e521c3c0..a9010c25d1 100644 --- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php +++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php @@ -34,7 +34,7 @@ * @ingroup JobQueue */ class HTMLCacheUpdateJob extends Job { - function __construct( $title, $params = '' ) { + function __construct( Title $title, array $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/jobqueue/jobs/NullJob.php b/includes/jobqueue/jobs/NullJob.php index f94d6ebc85..26d3c5c840 100644 --- a/includes/jobqueue/jobs/NullJob.php +++ b/includes/jobqueue/jobs/NullJob.php @@ -49,7 +49,7 @@ class NullJob extends Job { * @param Title $title * @param array $params Job parameters (lives, usleep) */ - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'null', $title, $params ); if ( !isset( $this->params['lives'] ) ) { $this->params['lives'] = 1; diff --git a/includes/jobqueue/jobs/PublishStashedFileJob.php b/includes/jobqueue/jobs/PublishStashedFileJob.php index a922dd3d11..8a180ec35c 100644 --- a/includes/jobqueue/jobs/PublishStashedFileJob.php +++ b/includes/jobqueue/jobs/PublishStashedFileJob.php @@ -29,7 +29,7 @@ * @ingroup JobQueue */ class PublishStashedFileJob extends Job { - public function __construct( $title, $params ) { + public function __construct( Title $title, array $params ) { parent::__construct( 'PublishStashedFile', $title, $params ); $this->removeDuplicates = true; } diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php index cc04595d75..e86d9147e2 100644 --- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php +++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php @@ -27,7 +27,7 @@ * @since 1.25 */ class RecentChangesUpdateJob extends Job { - function __construct( $title, $params ) { + function __construct( Title $title, array $params ) { parent::__construct( 'recentChangesUpdate', $title, $params ); if ( !isset( $params['type'] ) ) { diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php index 749913aef7..f7064556bf 100644 --- a/includes/jobqueue/jobs/RefreshLinksJob.php +++ b/includes/jobqueue/jobs/RefreshLinksJob.php @@ -39,7 +39,7 @@ class RefreshLinksJob extends Job { const CLOCK_FUDGE = 10; - function __construct( $title, $params = '' ) { + function __construct( Title $title, array $params ) { parent::__construct( 'refreshLinks', $title, $params ); // A separate type is used just for cascade-protected backlinks if ( !empty( $this->params['prioritize'] ) ) { diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php b/includes/jobqueue/jobs/ThumbnailRenderJob.php index ab381388a5..a58fa8b17d 100644 --- a/includes/jobqueue/jobs/ThumbnailRenderJob.php +++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php @@ -27,7 +27,7 @@ * @ingroup JobQueue */ class ThumbnailRenderJob extends Job { - public function __construct( $title, $params ) { + public function __construct( Title $title, array $params ) { parent::__construct( 'ThumbnailRender', $title, $params ); } diff --git a/includes/jobqueue/jobs/UploadFromUrlJob.php b/includes/jobqueue/jobs/UploadFromUrlJob.php index d15fd0257b..a15d51e835 100644 --- a/includes/jobqueue/jobs/UploadFromUrlJob.php +++ b/includes/jobqueue/jobs/UploadFromUrlJob.php @@ -39,7 +39,7 @@ class UploadFromUrlJob extends Job { /** @var User */ protected $user; - public function __construct( $title, $params ) { + public function __construct( Title $title, array $params ) { parent::__construct( 'uploadFromUrl', $title, $params ); } diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php index df91588805..d7c19ef5b4 100644 --- a/includes/upload/UploadBase.php +++ b/includes/upload/UploadBase.php @@ -746,11 +746,11 @@ abstract class UploadBase { $file = $this->getLocalFile(); foreach ( $sizes as $size ) { - if ( $file->isVectorized() - || $file->getWidth() > $size ) { - $jobs[] = new ThumbnailRenderJob( $file->getTitle(), array( - 'transformParams' => array( 'width' => $size ), - ) ); + if ( $file->isVectorized() || $file->getWidth() > $size ) { + $jobs[] = new ThumbnailRenderJob( + $file->getTitle(), + array( 'transformParams' => array( 'width' => $size ) ) + ); } }