Merge "Set method visibility for Job::run implementation"

7 files changed, 7 insertions, 8 deletions

diff --git a/.phpcs.xml b/.phpcs.xml
index 08b00a012741..193982adac3d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -33,7 +33,6 @@
 		<exclude-pattern>includes/htmlform/</exclude-pattern>
 		<exclude-pattern>includes/import/</exclude-pattern>
 		<exclude-pattern>includes/installer/</exclude-pattern>
-		<exclude-pattern>includes/jobqueue/</exclude-pattern>
 		<exclude-pattern>includes/language/</exclude-pattern>
 		<exclude-pattern>includes/libs/</exclude-pattern>
 		<exclude-pattern>includes/logging/</exclude-pattern>
diff --git a/includes/jobqueue/jobs/DeleteLinksJob.php b/includes/jobqueue/jobs/DeleteLinksJob.php
index c6829b598804..d28b88d56251 100644
--- a/includes/jobqueue/jobs/DeleteLinksJob.php
+++ b/includes/jobqueue/jobs/DeleteLinksJob.php
@@ -37,7 +37,7 @@ class DeleteLinksJob extends Job {
 		$this->removeDuplicates = true;
 	}
 
-	function run() {
+	public function run() {
 		if ( is_null( $this->title ) ) {
 			$this->setLastError( "deleteLinks: Invalid title" );
 			return false;
diff --git a/includes/jobqueue/jobs/DoubleRedirectJob.php b/includes/jobqueue/jobs/DoubleRedirectJob.php
index 5a4b037d760e..3d9dd8a58ad0 100644
--- a/includes/jobqueue/jobs/DoubleRedirectJob.php
+++ b/includes/jobqueue/jobs/DoubleRedirectJob.php
@@ -96,7 +96,7 @@ class DoubleRedirectJob extends Job {
 	/**
 	 * @return bool
 	 */
-	function run() {
+	public function run() {
 		if ( !$this->redirTitle ) {
 			$this->setLastError( 'Invalid title' );
 
@@ -239,7 +239,7 @@ class DoubleRedirectJob extends Job {
 	 *
 	 * @return User|bool
 	 */
-	function getUser() {
+	private function getUser() {
 		if ( !self::$user ) {
 			$username = wfMessage( 'double-redirect-fixer' )->inContentLanguage()->text();
 			self::$user = User::newFromName( $username );
diff --git a/includes/jobqueue/jobs/EmaillingJob.php b/includes/jobqueue/jobs/EmaillingJob.php
index f58c81195e35..f902501b46a5 100644
--- a/includes/jobqueue/jobs/EmaillingJob.php
+++ b/includes/jobqueue/jobs/EmaillingJob.php
@@ -32,7 +32,7 @@ class EmaillingJob extends Job {
 		parent::__construct( 'sendMail', Title::newMainPage(), $params );
 	}
 
-	function run() {
+	public function run() {
 		$status = UserMailer::send(
 			$this->params['to'],
 			$this->params['from'],
diff --git a/includes/jobqueue/jobs/EnotifNotifyJob.php b/includes/jobqueue/jobs/EnotifNotifyJob.php
index 63a902c57b7d..80750a1ad351 100644
--- a/includes/jobqueue/jobs/EnotifNotifyJob.php
+++ b/includes/jobqueue/jobs/EnotifNotifyJob.php
@@ -31,7 +31,7 @@ class EnotifNotifyJob extends Job {
 		parent::__construct( 'enotifNotify', $title, $params );
 	}
 
-	function run() {
+	public function run() {
 		$enotif = new EmailNotification();
 		// Get the user from ID (rename safe). Anons are 0, so defer to name.
 		if ( isset( $this->params['editorID'] ) && $this->params['editorID'] ) {
diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 22f44b3a9e49..fe24a54d86c9 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -68,7 +68,7 @@ class HTMLCacheUpdateJob extends Job {
 		);
 	}
 
-	function run() {
+	public function run() {
 		global $wgUpdateRowsPerJob, $wgUpdateRowsPerQuery;
 
 		if ( isset( $this->params['table'] ) && !isset( $this->params['pages'] ) ) {
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index fb3573f22f09..d493b698d0e9 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -84,7 +84,7 @@ class RefreshLinksJob extends Job {
 		return $job;
 	}
 
-	function run() {
+	public function run() {
 		$ok = true;
 
 		// Job to update all (or a range of) backlink pages for a page