jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399538 )
Change subject: Putting MassMessage Extension in PHP namespace
MediaWiki\MassMessage
......................................................................
Putting MassMessage Extension in PHP namespace MediaWiki\MassMessage
Considering the Outreachy/15 project for refactoring MassMessage
Extension (see here: T178431), putting
the extension in a PHP namespace is one of the todos.
Bug: T178215
Change-Id: I370f865f04571dccca52cc1edbc3d00cf003bc51
---
M MassMessage.hooks.php
M extension.json
M includes/ApiEditMassMessageList.php
M includes/ApiMassMessage.php
M includes/ApiQueryMMSites.php
M includes/MassMessage.php
M includes/MassMessageTargets.php
M includes/SpecialCreateMassMessageList.php
M includes/SpecialEditMassMessageList.php
M includes/SpecialMassMessage.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
M includes/content/MassMessageListDiffEngine.php
M includes/job/MassMessageJob.php
M includes/job/MassMessageServerSideJob.php
M includes/job/MassMessageSubmitJob.php
M includes/logging/MassMessageFailureLogFormatter.php
M includes/logging/MassMessageSendLogFormatter.php
M includes/logging/MassMessageSkipLogFormatter.php
M maintenance/sendMessages.php
M tests/phpunit/MassMessageApiTestCase.php
M tests/phpunit/MassMessageTargetsTest.php
M tests/phpunit/MassMessageTest.php
M tests/phpunit/MassMessageTestCase.php
M tests/phpunit/api/ApiEditMassMessageListTest.php
M tests/phpunit/api/ApiMassMessageTest.php
M tests/phpunit/api/ApiQueryMMSitesTest.php
M tests/phpunit/content/MassMessageContentHandlerTest.php
M tests/phpunit/content/MassMessageContentTest.php
M tests/phpunit/job/MassMessageJobTest.php
M tests/phpunit/job/MassMessageSubmitJobTest.php
31 files changed, 310 insertions(+), 85 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MassMessage.hooks.php b/MassMessage.hooks.php
index db2a4af..15da813 100644
--- a/MassMessage.hooks.php
+++ b/MassMessage.hooks.php
@@ -4,6 +4,15 @@
* Hooks!
*/
+namespace MediaWiki\MassMessage;
+
+use SpecialPage;
+use OutputPage;
+use Parser;
+use Skin;
+use EchoEvent;
+use User;
+
class MassMessageHooks {
/**
@@ -12,7 +21,8 @@
* @return bool
*/
public static function onParserFirstCallInit( Parser &$parser ) {
- $parser->setFunctionHook( 'target',
'MassMessageHooks::outputParserFunction' );
+ $parser->setFunctionHook( 'target',
+
'MediaWiki\\MassMessage\\MassMessageHooks::outputParserFunction' );
return true;
}
diff --git a/extension.json b/extension.json
index eac1821..91c79ec 100644
--- a/extension.json
+++ b/extension.json
@@ -31,14 +31,14 @@
"MassMessageMagic": "MassMessage.i18n.magic.php"
},
"APIModules": {
- "massmessage": "ApiMassMessage",
- "editmassmessagelist": "ApiEditMassMessageList"
+ "massmessage": "MediaWiki\\MassMessage\\ApiMassMessage",
+ "editmassmessagelist":
"MediaWiki\\MassMessage\\ApiEditMassMessageList"
},
"LogTypes": [
"massmessage"
],
"APIListModules": {
- "mmsites": "ApiQueryMMSites"
+ "mmsites": "MediaWiki\\MassMessage\\ApiQueryMMSites"
},
"MessagesDirs": {
"MassMessage": [
@@ -52,38 +52,38 @@
},
"Hooks": {
"ParserFirstCallInit": [
- "MassMessageHooks::onParserFirstCallInit"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onParserFirstCallInit"
],
"SpecialStatsAddExtra": [
- "MassMessageHooks::onSpecialStatsAddExtra"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onSpecialStatsAddExtra"
],
"APIQuerySiteInfoStatisticsInfo": [
- "MassMessageHooks::onAPIQuerySiteInfoStatisticsInfo"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onAPIQuerySiteInfoStatisticsInfo"
],
"RenameUserPreRename": [
- "MassMessageHooks::onRenameUserPreRename"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onRenameUserPreRename"
],
"UserGetReservedNames": [
- "MassMessageHooks::onUserGetReservedNames"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onUserGetReservedNames"
],
"BeforeEchoEventInsert": [
- "MassMessageHooks::onBeforeEchoEventInsert"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onBeforeEchoEventInsert"
],
"SkinTemplateNavigation": [
- "MassMessageHooks::onSkinTemplateNavigation"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onSkinTemplateNavigation"
],
"BeforePageDisplay": [
- "MassMessageHooks::onBeforePageDisplay"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onBeforePageDisplay"
],
"ListDefinedTags": [
- "MassMessageHooks::onRegisterTags"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onRegisterTags"
],
"ChangeTagsListActive": [
- "MassMessageHooks::onRegisterTags"
+
"MediaWiki\\MassMessage\\MassMessageHooks::onRegisterTags"
]
},
"ContentHandlers": {
- "MassMessageListContent": "MassMessageListContentHandler"
+ "MassMessageListContent":
"MediaWiki\\MassMessage\\MassMessageListContentHandler"
},
"ResourceModules": {
"ext.MassMessage.autocomplete": {
@@ -170,9 +170,9 @@
"remoteExtPath": "MassMessage/modules"
},
"JobClasses": {
- "MassMessageJob": "MassMessageJob",
- "MassMessageSubmitJob": "MassMessageSubmitJob",
- "MassMessageServerSideJob": "MassMessageServerSideJob"
+ "MassMessageJob": "MediaWiki\\MassMessage\\MassMessageJob",
+ "MassMessageSubmitJob":
"MediaWiki\\MassMessage\\MassMessageSubmitJob",
+ "MassMessageServerSideJob":
"MediaWiki\\MassMessage\\MassMessageServerSideJob"
},
"GroupPermissions": {
"sysop": {
@@ -181,11 +181,11 @@
},
"LogActionsHandlers": {
"massmessage/*": "LogFormatter",
- "massmessage/send": "MassMessageSendLogFormatter",
- "massmessage/failure": "MassMessageFailureLogFormatter",
- "massmessage/skipoptout": "MassMessageSkipLogFormatter",
- "massmessage/skipnouser": "MassMessageSkipLogFormatter",
- "massmessage/skipbadns": "MassMessageSkipLogFormatter"
+ "massmessage/send":
"MediaWiki\\MassMessage\\MassMessageSendLogFormatter",
+ "massmessage/failure":
"MediaWiki\\MassMessage\\MassMessageFailureLogFormatter",
+ "massmessage/skipoptout":
"MediaWiki\\MassMessage\\MassMessageSkipLogFormatter",
+ "massmessage/skipnouser":
"MediaWiki\\MassMessage\\MassMessageSkipLogFormatter",
+ "massmessage/skipbadns":
"MediaWiki\\MassMessage\\MassMessageSkipLogFormatter"
},
"ActionFilteredLogs": {
"massmessage": {
@@ -200,31 +200,31 @@
"massmessage"
],
"SpecialPages": {
- "MassMessage": "SpecialMassMessage",
- "CreateMassMessageList": "SpecialCreateMassMessageList",
- "EditMassMessageList": "SpecialEditMassMessageList"
+ "MassMessage": "MediaWiki\\MassMessage\\SpecialMassMessage",
+ "CreateMassMessageList":
"MediaWiki\\MassMessage\\SpecialCreateMassMessageList",
+ "EditMassMessageList":
"MediaWiki\\MassMessage\\SpecialEditMassMessageList"
},
"AutoloadClasses": {
- "MassMessageHooks": "MassMessage.hooks.php",
- "ApiMassMessage": "includes/ApiMassMessage.php",
- "ApiEditMassMessageList": "includes/ApiEditMassMessageList.php",
- "ApiQueryMMSites": "includes/ApiQueryMMSites.php",
- "MassMessage": "includes/MassMessage.php",
- "MassMessageTargets": "includes/MassMessageTargets.php",
- "SpecialMassMessage": "includes/SpecialMassMessage.php",
- "SpecialCreateMassMessageList":
"includes/SpecialCreateMassMessageList.php",
- "SpecialEditMassMessageList":
"includes/SpecialEditMassMessageList.php",
- "MassMessageJob": "includes/job/MassMessageJob.php",
- "MassMessageServerSideJob":
"includes/job/MassMessageServerSideJob.php",
- "MassMessageSubmitJob": "includes/job/MassMessageSubmitJob.php",
- "MassMessageFailureLogFormatter":
"includes/logging/MassMessageFailureLogFormatter.php",
- "MassMessageSendLogFormatter":
"includes/logging/MassMessageSendLogFormatter.php",
- "MassMessageSkipLogFormatter":
"includes/logging/MassMessageSkipLogFormatter.php",
- "MassMessageListContent":
"includes/content/MassMessageListContent.php",
- "MassMessageListContentHandler":
"includes/content/MassMessageListContentHandler.php",
- "MassMessageListDiffEngine":
"includes/content/MassMessageListDiffEngine.php",
- "MassMessageTestCase": "tests/phpunit/MassMessageTestCase.php",
- "MassMessageApiTestCase":
"tests/phpunit/MassMessageApiTestCase.php"
+ "MediaWiki\\MassMessage\\MassMessageHooks":
"MassMessage.hooks.php",
+ "MediaWiki\\MassMessage\\ApiMassMessage":
"includes/ApiMassMessage.php",
+ "MediaWiki\\MassMessage\\ApiEditMassMessageList":
"includes/ApiEditMassMessageList.php",
+ "MediaWiki\\MassMessage\\ApiQueryMMSites":
"includes/ApiQueryMMSites.php",
+ "MediaWiki\\MassMessage\\MassMessage":
"includes/MassMessage.php",
+ "MediaWiki\\MassMessage\\MassMessageTargets":
"includes/MassMessageTargets.php",
+ "MediaWiki\\MassMessage\\SpecialMassMessage":
"includes/SpecialMassMessage.php",
+ "MediaWiki\\MassMessage\\SpecialCreateMassMessageList":
"includes/SpecialCreateMassMessageList.php",
+ "MediaWiki\\MassMessage\\SpecialEditMassMessageList":
"includes/SpecialEditMassMessageList.php",
+ "MediaWiki\\MassMessage\\MassMessageJob":
"includes/job/MassMessageJob.php",
+ "MediaWiki\\MassMessage\\MassMessageServerSideJob":
"includes/job/MassMessageServerSideJob.php",
+ "MediaWiki\\MassMessage\\MassMessageSubmitJob":
"includes/job/MassMessageSubmitJob.php",
+ "MediaWiki\\MassMessage\\MassMessageFailureLogFormatter":
"includes/logging/MassMessageFailureLogFormatter.php",
+ "MediaWiki\\MassMessage\\MassMessageSendLogFormatter":
"includes/logging/MassMessageSendLogFormatter.php",
+ "MediaWiki\\MassMessage\\MassMessageSkipLogFormatter":
"includes/logging/MassMessageSkipLogFormatter.php",
+ "MediaWiki\\MassMessage\\MassMessageListContent":
"includes/content/MassMessageListContent.php",
+ "MediaWiki\\MassMessage\\MassMessageListContentHandler":
"includes/content/MassMessageListContentHandler.php",
+ "MediaWiki\\MassMessage\\MassMessageListDiffEngine":
"includes/content/MassMessageListDiffEngine.php",
+ "MediaWiki\\MassMessage\\MassMessageTestCase":
"tests/phpunit/MassMessageTestCase.php",
+ "MediaWiki\\MassMessage\\MassMessageApiTestCase":
"tests/phpunit/MassMessageApiTestCase.php"
},
"manifest_version": 1
}
diff --git a/includes/ApiEditMassMessageList.php
b/includes/ApiEditMassMessageList.php
index c95943b..9ffd8e7 100644
--- a/includes/ApiEditMassMessageList.php
+++ b/includes/ApiEditMassMessageList.php
@@ -1,9 +1,18 @@
<?php
+
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Revision;
+use ApiBase;
+use LinkBatch;
+
/**
* API module to edit a MassMessage delivery list
*
* @ingroup API
*/
+
class ApiEditMassMessageList extends ApiBase {
public function execute() {
@@ -69,19 +78,19 @@
$invalidRemove = array_unique( $invalidRemove );
$newTargets = array_values( array_udiff( $newTargets,
$toRemove,
- 'MassMessageListContentHandler::compareTargets'
) );
+
'MediaWiki\\MassMessage\\MassMessageListContentHandler::compareTargets' ) );
}
if ( isset( $data['add'] ) ) {
$added = array_values( array_udiff( $newTargets,
$targets,
- 'MassMessageListContentHandler::compareTargets'
) );
+
'MediaWiki\\MassMessage\\MassMessageListContentHandler::compareTargets' ) );
} else {
$added = [];
}
if ( isset( $data['remove'] ) ) {
$removed = array_values( array_udiff( $targets,
$newTargets,
- 'MassMessageListContentHandler::compareTargets'
) );
+
'MediaWiki\\MassMessage\\MassMessageListContentHandler::compareTargets' ) );
} else {
$removed = [];
}
diff --git a/includes/ApiMassMessage.php b/includes/ApiMassMessage.php
index 4f809a3..9038952 100644
--- a/includes/ApiMassMessage.php
+++ b/includes/ApiMassMessage.php
@@ -1,4 +1,11 @@
<?php
+
+
+namespace MediaWiki\MassMessage;
+
+use Status;
+use ApiBase;
+
/**
* API module to send MassMessages
*
@@ -7,6 +14,7 @@
* @author Kunal Mehta
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+
class ApiMassMessage extends ApiBase {
public function execute() {
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
diff --git a/includes/ApiQueryMMSites.php b/includes/ApiQueryMMSites.php
index f280c8d..050d74b 100644
--- a/includes/ApiQueryMMSites.php
+++ b/includes/ApiQueryMMSites.php
@@ -4,6 +4,12 @@
*
* @ingroup API
*/
+
+namespace MediaWiki\MassMessage;
+
+use ApiBase;
+use ApiQueryBase;
+
class ApiQueryMMSites extends ApiQueryBase {
public function execute() {
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 1cc73c6..6bedf19 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -8,6 +8,22 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+namespace MediaWiki\MassMessage;
+
+use Parser;
+use ParserOptions;
+use Exception;
+use Title;
+use WikiPage;
+use User;
+use JobQueueGroup;
+use CentralIdLookup;
+use Revision;
+use ManualLogEntry;
+use WikiMap;
+use Status;
+use RequestContext;
+
class MassMessage {
/**
@@ -326,7 +342,7 @@
$params = [
'data' => $data,
'pages' => $pages,
- 'class' => 'MassMessageJob',
+ 'class' => MassMessageJob::class,
];
$job = new MassMessageSubmitJob( $spamlist, $params );
JobQueueGroup::singleton()->push( $job );
diff --git a/includes/MassMessageTargets.php b/includes/MassMessageTargets.php
index a8b6c48..c4e1966 100644
--- a/includes/MassMessageTargets.php
+++ b/includes/MassMessageTargets.php
@@ -4,6 +4,14 @@
* Functions related to target processing
*/
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Revision;
+use Category;
+use Parser;
+use WikiPage;
+
class MassMessageTargets {
/**
@@ -152,7 +160,7 @@
// Now overwrite it
$parser->setFunctionHook(
'target',
- 'MassMessageHooks::storeDataParserFunction'
+
'MediaWiki\\MassMessage\\MassMessageHooks::storeDataParserFunction'
);
// Parse
diff --git a/includes/SpecialCreateMassMessageList.php
b/includes/SpecialCreateMassMessageList.php
index 11fae51..5ce83b1 100644
--- a/includes/SpecialCreateMassMessageList.php
+++ b/includes/SpecialCreateMassMessageList.php
@@ -1,5 +1,11 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Status;
+use FormSpecialPage;
+
class SpecialCreateMassMessageList extends FormSpecialPage {
public function __construct() {
diff --git a/includes/SpecialEditMassMessageList.php
b/includes/SpecialEditMassMessageList.php
index 9f9dbbc..cfb7451 100644
--- a/includes/SpecialEditMassMessageList.php
+++ b/includes/SpecialEditMassMessageList.php
@@ -1,5 +1,15 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Revision;
+use Status;
+use EditPage;
+use Html;
+use FormSpecialPage;
+use HTMLForm;
+
class SpecialEditMassMessageList extends FormSpecialPage {
/**
diff --git a/includes/SpecialMassMessage.php b/includes/SpecialMassMessage.php
index 1d39ba2..a6a0e71 100644
--- a/includes/SpecialMassMessage.php
+++ b/includes/SpecialMassMessage.php
@@ -11,6 +11,17 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+namespace MediaWiki\MassMessage;
+
+use Status;
+use EditPage;
+use HTMLForm;
+use WikiPage;
+use ContentHandler;
+use SpecialPage;
+use Xml;
+use Title;
+
class SpecialMassMessage extends SpecialPage {
/**
diff --git a/includes/content/MassMessageListContent.php
b/includes/content/MassMessageListContent.php
index 1b5cfc7..5c48c4b 100644
--- a/includes/content/MassMessageListContent.php
+++ b/includes/content/MassMessageListContent.php
@@ -1,5 +1,16 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Language;
+use Html;
+use Linker;
+use ParserOptions;
+use ParserOutput;
+use JsonContent;
+use Title;
+use LinkBatch;
+
class MassMessageListContent extends JsonContent {
/**
diff --git a/includes/content/MassMessageListContentHandler.php
b/includes/content/MassMessageListContentHandler.php
index fa87db5..1c9f1d4 100644
--- a/includes/content/MassMessageListContentHandler.php
+++ b/includes/content/MassMessageListContentHandler.php
@@ -1,5 +1,17 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use FormatJson;
+use Status;
+use Title;
+use DerivativeContext;
+use JsonContentHandler;
+use DerivativeRequest;
+use ApiMain;
+use IContextSource;
+use ApiUsageException;
+
class MassMessageListContentHandler extends JsonContentHandler {
/**
@@ -20,14 +32,14 @@
* @return string
*/
protected function getContentClass() {
- return 'MassMessageListContent';
+ return MassMessageListContent::class;
}
/**
* @return string
*/
protected function getDiffEngineClass() {
- return 'MassMessageListDiffEngine';
+ return MassMessageListDiffEngine::class;
}
/**
diff --git a/includes/content/MassMessageListDiffEngine.php
b/includes/content/MassMessageListDiffEngine.php
index 71b7943..fb3d8ea 100644
--- a/includes/content/MassMessageListDiffEngine.php
+++ b/includes/content/MassMessageListDiffEngine.php
@@ -3,6 +3,12 @@
* Difference engine for MassMessageListContent
*/
+namespace MediaWiki\MassMessage;
+
+use Html;
+use Content;
+use DifferenceEngine;
+
class MassMessageListDiffEngine extends DifferenceEngine {
/**
diff --git a/includes/job/MassMessageJob.php b/includes/job/MassMessageJob.php
index 44aad62..add5853 100644
--- a/includes/job/MassMessageJob.php
+++ b/includes/job/MassMessageJob.php
@@ -10,6 +10,23 @@
* @author Kunal Mehta
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+
+namespace MediaWiki\MassMessage;
+
+use Title;
+use WikiPage;
+use User;
+use RequestContext;
+use ApiMain;
+use CentralIdLookup;
+use DerivativeRequest;
+use ManualLogEntry;
+use Job;
+use DeferredUpdates;
+use ChangeTags;
+use ApiMessage;
+use LqtDispatch;
+
class MassMessageJob extends Job {
const STRIP_TILDES = true;
@@ -273,8 +290,8 @@
// Add our hook functions to make the MassMessage user IP
block-exempt and email confirmed
// Done here so that it's not unnecessarily called on every
page load
- $wgHooks['UserGetRights'][] =
'MassMessageHooks::onUserGetRights';
- $wgHooks['EmailConfirmed'][] =
'MassMessageHooks::onEmailConfirmed';
+ $wgHooks['UserGetRights'][] =
'MediaWiki\\MassMessage\\MassMessageHooks::onUserGetRights';
+ $wgHooks['EmailConfirmed'][] =
'MediaWiki\\MassMessage\\MassMessageHooks::onEmailConfirmed';
$oldRequest = $wgRequest;
$oldUser = $wgUser;
diff --git a/includes/job/MassMessageServerSideJob.php
b/includes/job/MassMessageServerSideJob.php
index 45f2248..1aea74d 100644
--- a/includes/job/MassMessageServerSideJob.php
+++ b/includes/job/MassMessageServerSideJob.php
@@ -8,6 +8,16 @@
* @author Kunal Mehta
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+
+namespace MediaWiki\MassMessage;
+
+use Title;
+use WikiPage;
+use Job;
+use WikitextContent;
+use Revision;
+use Exception;
+
class MassMessageServerSideJob extends MassMessageJob {
public function __construct( Title $title, array $params, $id = 0 ) {
Job::__construct( 'MassMessageServerSideJob', $title, $params,
$id );
diff --git a/includes/job/MassMessageSubmitJob.php
b/includes/job/MassMessageSubmitJob.php
index e51ce54..ab63ab4 100644
--- a/includes/job/MassMessageSubmitJob.php
+++ b/includes/job/MassMessageSubmitJob.php
@@ -1,4 +1,10 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Job;
+use JobQueueGroup;
+
/**
* JobQueue class to queue other jobs
*
@@ -8,11 +14,12 @@
* @author Kunal Mehta
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
+
class MassMessageSubmitJob extends Job {
public function __construct( Title $title, array $params, $id = 0 ) {
// Back-compat
if ( !isset( $params['class'] ) ) {
- $params['class'] = 'MassMessageJob';
+ $params['class'] = MassMessageJob::class;
}
parent::__construct( 'MassMessageSubmitJob', $title, $params,
$id );
}
diff --git a/includes/logging/MassMessageFailureLogFormatter.php
b/includes/logging/MassMessageFailureLogFormatter.php
index de3c7a9..d46ae8e 100644
--- a/includes/logging/MassMessageFailureLogFormatter.php
+++ b/includes/logging/MassMessageFailureLogFormatter.php
@@ -5,6 +5,10 @@
* This lets us use <code></code> tags in the message
*/
+namespace MediaWiki\MassMessage;
+
+use LogFormatter;
+
class MassMessageFailureLogFormatter extends LogFormatter {
/**
diff --git a/includes/logging/MassMessageSendLogFormatter.php
b/includes/logging/MassMessageSendLogFormatter.php
index 0afb10e..6545533 100644
--- a/includes/logging/MassMessageSendLogFormatter.php
+++ b/includes/logging/MassMessageSendLogFormatter.php
@@ -5,6 +5,13 @@
* This lets us link to the specific revid used to send the message
*/
+namespace MediaWiki\MassMessage;
+
+use Linker;
+use Message;
+use SpecialPage;
+use LogFormatter;
+
class MassMessageSendLogFormatter extends LogFormatter {
protected function getMessageParameters() {
diff --git a/includes/logging/MassMessageSkipLogFormatter.php
b/includes/logging/MassMessageSkipLogFormatter.php
index 787f3c9..fdde261 100644
--- a/includes/logging/MassMessageSkipLogFormatter.php
+++ b/includes/logging/MassMessageSkipLogFormatter.php
@@ -5,6 +5,12 @@
* Parses the message summary so wikilinks work
*/
+namespace MediaWiki\MassMessage;
+
+use Linker;
+use Message;
+use LogFormatter;
+
class MassMessageSkipLogFormatter extends LogFormatter {
/**
diff --git a/maintenance/sendMessages.php b/maintenance/sendMessages.php
index 9029a7d..d21a287 100644
--- a/maintenance/sendMessages.php
+++ b/maintenance/sendMessages.php
@@ -1,11 +1,15 @@
<?php
+namespace MediaWiki\MassMessage;
+
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
$IP = __DIR__ . '/../../..';
}
require_once "$IP/maintenance/Maintenance.php";
+use Title;
+
/**
* Script to send MassMessages server-side
*
diff --git a/tests/phpunit/MassMessageApiTestCase.php
b/tests/phpunit/MassMessageApiTestCase.php
index 2c14a7c..c6ec975 100644
--- a/tests/phpunit/MassMessageApiTestCase.php
+++ b/tests/phpunit/MassMessageApiTestCase.php
@@ -1,4 +1,8 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use ApiTestCase;
+use SiteConfiguration;
/**
* Abstract test case containing setup code and common functions
diff --git a/tests/phpunit/MassMessageTargetsTest.php
b/tests/phpunit/MassMessageTargetsTest.php
index 790efa1..f807c17 100644
--- a/tests/phpunit/MassMessageTargetsTest.php
+++ b/tests/phpunit/MassMessageTargetsTest.php
@@ -1,4 +1,10 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use WikiPage;
+use Title;
+use ContentHandler;
+use WikitextContent;
/**
* Tests for functions related to target processing
@@ -49,9 +55,9 @@
}
/**
- * @covers MassMessageTargets::getTargets
- * @covers MassMessageTargets::normalizeTargets
- * @covers MassMessageTargets::getParserFunctionTargets
+ * @covers \Mediawiki\MassMessage\MassMessageTargets::getTargets
+ * @covers \Mediawiki\MassMessage\MassMessageTargets::normalizeTargets
+ * @covers
\Mediawiki\MassMessage\MassMessageTargets::getParserFunctionTargets
* @dataProvider provideGetParserFunctionTargets
* @param string $text Text of the page to create
* @param array $check Stuff to check against
@@ -79,8 +85,8 @@
}
/**
- * @covers MassMessageTargets::getTargets
- * @covers MassMessageTargets::getCategoryTargets
+ * @covers \Mediawiki\MassMessage\MassMessageTargets::getTargets
+ * @covers \Mediawiki\MassMessage\MassMessageTargets::getCategoryTargets
*/
public function testGetCategoryTargets() {
$page = Title::newFromText( 'Talk:Testing1234' );
@@ -95,8 +101,8 @@
}
/**
- * @covers MassMessageTargets::getTargets
- * @covers MassMessageTargets::getMassMessageListContentTargets
+ * @covers \Mediawiki\MassMessage\MassMessageTargets::getTargets
+ * @covers
\Mediawiki\MassMessage\MassMessageTargets::getMassMessageListContentTargets
*/
public function testGetMassMessageListContentTargets() {
$text = '{"description":"","targets":['
diff --git a/tests/phpunit/MassMessageTest.php
b/tests/phpunit/MassMessageTest.php
index 78d3eab..654b8a1 100644
--- a/tests/phpunit/MassMessageTest.php
+++ b/tests/phpunit/MassMessageTest.php
@@ -1,4 +1,7 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
/**
* Tests for the MassMessage extension...
@@ -18,7 +21,7 @@
}
/**
- * @covers MassMessage::getDBName
+ * @covers \Mediawiki\MassMessage\MassMessage::getDBName
* @dataProvider provideGetDBName
* @param string $url
* @param string $expected
@@ -42,7 +45,7 @@
}
/**
- * @covers MassMessage::getBaseUrl
+ * @covers \Mediawiki\MassMessage\MassMessage::getBaseUrl
* @dataProvider provideGetBaseUrl
* @param string $url raw url to parse
* @param string $expected expected value
@@ -61,7 +64,7 @@
}
/**
- * @covers MassMessage::getMessengerUser
+ * @covers \Mediawiki\MassMessage\MassMessage::getMessengerUser
* @dataProvider provideGetMessengerUser
* @param string $name
*/
@@ -73,7 +76,7 @@
}
/**
- * @covers MassMessage::followRedirect
+ * @covers \Mediawiki\MassMessage\MassMessage::followRedirect
*/
public function testFollowRedirect() {
$title = Title::newfromtext( 'R1' );
diff --git a/tests/phpunit/MassMessageTestCase.php
b/tests/phpunit/MassMessageTestCase.php
index a2230b7..491e664 100644
--- a/tests/phpunit/MassMessageTestCase.php
+++ b/tests/phpunit/MassMessageTestCase.php
@@ -1,4 +1,12 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use MediaWikiTestCase;
+use Title;
+use WikiPage;
+use ContentHandler;
+use SiteConfiguration;
+use User;
/**
* Abstract test case containing setup code and common functions
diff --git a/tests/phpunit/api/ApiEditMassMessageListTest.php
b/tests/phpunit/api/ApiEditMassMessageListTest.php
index 6af6465..3333d1c 100644
--- a/tests/phpunit/api/ApiEditMassMessageListTest.php
+++ b/tests/phpunit/api/ApiEditMassMessageListTest.php
@@ -1,4 +1,9 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use ContentHandler;
+use WikiPage;
/**
* Tests for the API module to edit a MassMessage delivery list
@@ -6,6 +11,7 @@
* @group Database
* @group medium
*/
+
class ApiEditMassMessageListTest extends MassMessageApiTestCase {
protected static $spamlist = 'ApiEditMMListTest_spamlist';
diff --git a/tests/phpunit/api/ApiMassMessageTest.php
b/tests/phpunit/api/ApiMassMessageTest.php
index 578c09c..132e89f 100644
--- a/tests/phpunit/api/ApiMassMessageTest.php
+++ b/tests/phpunit/api/ApiMassMessageTest.php
@@ -1,4 +1,11 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use WikiPage;
+use Title;
+use User;
+use ContentHandler;
+use UsageException;
/**
* Tests for the API module to send messages
@@ -6,6 +13,7 @@
* @group Database
* @group medium
*/
+
class ApiMassMessageTest extends MassMessageApiTestCase {
protected static $spamlist = 'Help:ApiMassMessageTest_spamlist';
diff --git a/tests/phpunit/api/ApiQueryMMSitesTest.php
b/tests/phpunit/api/ApiQueryMMSitesTest.php
index 7e9e7db..bd597b0 100644
--- a/tests/phpunit/api/ApiQueryMMSitesTest.php
+++ b/tests/phpunit/api/ApiQueryMMSitesTest.php
@@ -1,10 +1,12 @@
<?php
+namespace MediaWiki\MassMessage;
/**
* Tests for the API module to serve autocomplete requests for the site field
* @group API
* @group medium
*/
+
class ApiQueryMMSitesTest extends MassMessageApiTestCase {
public function testQuery() {
diff --git a/tests/phpunit/content/MassMessageContentHandlerTest.php
b/tests/phpunit/content/MassMessageContentHandlerTest.php
index 249420c..d11ce52 100644
--- a/tests/phpunit/content/MassMessageContentHandlerTest.php
+++ b/tests/phpunit/content/MassMessageContentHandlerTest.php
@@ -1,4 +1,9 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use Revision;
+use RequestContext;
/**
* This inherits ApiTestCase because MassMessageListContentHandler::edit goes
through
@@ -7,6 +12,7 @@
* @group Database
* @group medium
*/
+
class MassMessageListContentHandlerTest extends MassMessageApiTestCase {
protected static $spamlist = 'MassMessageListCHTest_spamlist';
@@ -27,7 +33,7 @@
}
/**
- * @covers MassMessageListContentHandler::edit
+ * @covers \Mediawiki\MassMessage\MassMessageListContentHandler::edit
*/
public function testEdit() {
$this->doLogin();
@@ -52,7 +58,7 @@
}
/**
- * @covers MassMessageListContentHandler::edit
+ * @covers \Mediawiki\MassMessage\MassMessageListContentHandler::edit
*/
public function testInvalidEdit() {
$this->doLogin();
@@ -68,7 +74,7 @@
}
/**
- * @covers MassMessageListContentHandler::normalizeTargetArray
+ * @covers
\Mediawiki\MassMessage\MassMessageListContentHandler::normalizeTargetArray
*/
public function testNormalizeTargetArray() {
$input = [
@@ -120,7 +126,7 @@
}
/**
- * @covers MassMessageListContentHandler::compareTargets
+ * @covers
\Mediawiki\MassMessage\MassMessageListContentHandler::compareTargets
* @dataProvider provideCompareTargets
* @param array $a
* @param array $b
@@ -148,7 +154,7 @@
}
/**
- * @covers MassMessageListContentHandler::extractTarget
+ * @covers
\Mediawiki\MassMessage\MassMessageListContentHandler::extractTarget
* @dataProvider provideExtractTarget
* @param string $targetString
* @param array $expected Parsed target
diff --git a/tests/phpunit/content/MassMessageContentTest.php
b/tests/phpunit/content/MassMessageContentTest.php
index 7465310..9c77d49 100644
--- a/tests/phpunit/content/MassMessageContentTest.php
+++ b/tests/phpunit/content/MassMessageContentTest.php
@@ -1,5 +1,7 @@
<?php
+namespace MediaWiki\MassMessage;
+
class MassMessageListContentTest extends MassMessageTestCase {
public static function provideIsValid() {
@@ -14,7 +16,7 @@
}
/**
- * @covers MassMessageListContent::isValid
+ * @covers \Mediawiki\MassMessage\MassMessageListContent::isValid
* @dataProvider provideIsValid
* @param string $text
* @param bool $expected
@@ -34,7 +36,7 @@
}
/**
- * @covers MassMessageListContent::hasInvalidTargets
+ * @covers
\Mediawiki\MassMessage\MassMessageListContent::hasInvalidTargets
* @dataProvider provideHasInvalidTargets
* @param string $text
* @param bool $expected
@@ -45,7 +47,7 @@
}
/**
- * @covers MassMessageListContent::getDescription
+ * @covers\Mediawiki\MassMessage\ MassMessageListContent::getDescription
*/
public function testGetDescription() {
$content = new MassMessageListContent(
'{"description":"foo","targets":[]}' );
@@ -53,7 +55,7 @@
}
/**
- * @covers MassMessageListContent::getTargets
+ * @covers \Mediawiki\MassMessage\MassMessageListContent::getTargets
*/
public function testGetTargets() {
$text = '{"description":"","targets":['
@@ -69,7 +71,7 @@
}
/**
- * @covers MassMessageListContent::getValidTargets
+ * @covers
\Mediawiki\MassMessage\MassMessageListContent::getValidTargets
*/
public function testGetValidTargets() {
$text = '{"description":"","targets":['
@@ -86,7 +88,7 @@
}
/**
- * @covers MassMessageListContent::getTargetStrings
+ * @covers
\Mediawiki\MassMessage\MassMessageListContent::getTargetStrings
*/
public function testGetTargetStrings() {
// Temporarily set $wgCanonicalServer for this test so its
value is predictable.
diff --git a/tests/phpunit/job/MassMessageJobTest.php
b/tests/phpunit/job/MassMessageJobTest.php
index 65a1113..d76c29f 100644
--- a/tests/phpunit/job/MassMessageJobTest.php
+++ b/tests/phpunit/job/MassMessageJobTest.php
@@ -1,5 +1,13 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use Title;
+use WikiPage;
+use User;
+use MWCryptRand;
+use Revision;
+
class MassMessageJobTest extends MassMessageTestCase {
/**
@@ -23,8 +31,8 @@
}
/**
- * @covers MassMessageJob::sendMessage
- * @covers MassMessageJob::editPage
+ * @covers \Mediawiki\MassMessage\MassMessageJob::sendMessage
+ * @covers \Mediawiki\MassMessage\MassMessageJob::editPage
*/
public function testMessageSending() {
$target = Title::newFromText( 'Project:Testing1234' );
@@ -46,8 +54,8 @@
}
/**
- * @covers MassMessageJob::addLQTThread
- * @covers MassMessageJob::sendMessage
+ * @covers \Mediawiki\MassMessage\MassMessageJob::addLQTThread
+ * @covers \Mediawiki\MassMessage\MassMessageJob::sendMessage
*/
public function testLQTMessageSending() {
global $wgContLang;
@@ -64,7 +72,7 @@
}
/**
- * @covers MassMessageJob::isOptedOut
+ * @covers \Mediawiki\MassMessage\MassMessageJob::isOptedOut
*/
public function testOptOut() {
$fakejob = new MassMessageJob( Title::newMainPage(), [] );
diff --git a/tests/phpunit/job/MassMessageSubmitJobTest.php
b/tests/phpunit/job/MassMessageSubmitJobTest.php
index b73001a..59aebbc 100644
--- a/tests/phpunit/job/MassMessageSubmitJobTest.php
+++ b/tests/phpunit/job/MassMessageSubmitJobTest.php
@@ -1,9 +1,13 @@
<?php
+namespace MediaWiki\MassMessage;
+
+use MediaWikiTestCase;
+
class MassMessageSubmitJobTest extends MediaWikiTestCase {
/**
- * @covers MassMessageSubmitJob::getJobs
+ * @covers \Mediawiki\MassMessage\MassMessageSubmitJob::getJobs
* @dataProvider provideGetJobs
*/
public function testGetJobs( $data, $pages ) {
@@ -19,7 +23,7 @@
/** @var MassMessageJob $job */
foreach ( $jobs as $job ) {
$count++;
- $this->assertInstanceOf( 'MassMessageJob', $job
);
+ $this->assertInstanceOf( MassMessageJob::class,
$job );
$params = $job->getParams();
foreach ( $data as $key => $val ) {
$this->assertArrayHasKey( $key, $params
);
--
To view, visit https://gerrit.wikimedia.org/r/399538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I370f865f04571dccca52cc1edbc3d00cf003bc51
Gerrit-PatchSet: 20
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Noella94 <[email protected]>
Gerrit-Reviewer: D3r1ck01 <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
