Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349281 )
Change subject: Some style fixes to better match MW coding conventions
......................................................................
Some style fixes to better match MW coding conventions
Automatically done by phpcbf
Bug: T163487
Change-Id: Ibd2aeddd1e71122f006173c562b446685d7e9125
---
M Newsletter.alias.php
M Newsletter.hooks.php
M includes/Echo/BaseNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPublisherPresentationModel.php
M includes/Echo/EchoNewsletterSubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUserLocator.php
M includes/Newsletter.php
M includes/NewsletterDb.php
M includes/NewsletterEditPage.php
M includes/NewsletterStore.php
M includes/NewsletterValidator.php
M includes/api/ApiNewsletterManage.php
M includes/api/ApiNewsletterSubscribe.php
M includes/content/NewsletterContent.php
M includes/content/NewsletterDiffEngine.php
M includes/logging/NewsletterLogFormatter.php
M includes/specials/SpecialNewsletter.php
M includes/specials/SpecialNewsletterCreate.php
M includes/specials/SpecialNewsletters.php
M includes/specials/pagers/NewsletterTablePager.php
M maintenance/deleteInactiveNewsletters.php
M tests/NewsletterDbTest.php
M tests/api/ApiNewsletterTest.php
25 files changed, 333 insertions(+), 335 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/81/349281/1
diff --git a/Newsletter.alias.php b/Newsletter.alias.php
index e7e8d5f..626852e 100644
--- a/Newsletter.alias.php
+++ b/Newsletter.alias.php
@@ -6,11 +6,11 @@
* @ingroup Extensions
*/
-$specialPageAliases = array();
+$specialPageAliases = [];
/** English */
-$specialPageAliases['en'] = array(
- 'NewsletterCreate' => array( 'CreateNewsletter' ),
- 'Newsletters' => array( 'Newsletters' ),
- 'Newsletter' => array( 'Newsletter' )
-);
+$specialPageAliases['en'] = [
+ 'NewsletterCreate' => [ 'CreateNewsletter' ],
+ 'Newsletters' => [ 'Newsletters' ],
+ 'Newsletter' => [ 'Newsletter' ]
+];
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 71db636..7790b2a 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -13,78 +13,78 @@
* @return bool
*/
public static function onBeforeCreateEchoEvent( &$notifications,
&$notificationCategories ) {
- $notificationCategories['newsletter'] = array(
+ $notificationCategories['newsletter'] = [
'priority' => 3,
'tooltip' => 'echo-pref-tooltip-newsletter',
- );
+ ];
- $notifications['newsletter-announce'] = array(
+ $notifications['newsletter-announce'] = [
'category' => 'newsletter',
'section' => 'alert',
- 'primary-link' => array(
+ 'primary-link' => [
'message' =>
'newsletter-notification-link-text-new-issue',
'destination' => 'new-issue'
- ),
- 'secondary-link' => array(
+ ],
+ 'secondary-link' => [
'message' =>
'newsletter-notification-link-text-view-newsletter',
'destination' => 'newsletter'
- ),
- 'user-locators' => array(
+ ],
+ 'user-locators' => [
'EchoNewsletterUserLocator::locateNewsletterSubscribedUsers',
- ),
+ ],
'presentation-model' =>
'EchoNewsletterPresentationModel',
'title-message' => 'newsletter-notification-title',
- 'title-params' => array( 'newsletter-name', 'title',
'agent', 'user' ),
+ 'title-params' => [ 'newsletter-name', 'title',
'agent', 'user' ],
'flyout-message' => 'newsletter-notification-flyout',
- 'flyout-params' => array( 'newsletter-name', 'agent',
'user' ),
- 'payload' => array( 'summary' ),
+ 'flyout-params' => [ 'newsletter-name', 'agent', 'user'
],
+ 'payload' => [ 'summary' ],
'email-subject-message' => 'newsletter-email-subject',
- 'email-subject-params' => array( 'newsletter-name' ),
+ 'email-subject-params' => [ 'newsletter-name' ],
'email-body-batch-message' =>
'newsletter-email-batch-body',
- 'email-body-batch-params' => array( 'newsletter-name',
'agent', 'user' ),
- );
+ 'email-body-batch-params' => [ 'newsletter-name',
'agent', 'user' ],
+ ];
- $notifications['newsletter-newpublisher'] = array(
+ $notifications['newsletter-newpublisher'] = [
'category' => 'newsletter',
- 'primary-link' => array(
+ 'primary-link' => [
'message' =>
'newsletter-notification-link-text-new-publisher',
'destination' => 'newsletter'
- ),
- 'user-locators' => array(
- array( 'EchoUserLocator::locateFromEventExtra',
array( 'new-publishers-id' ) )
- ),
+ ],
+ 'user-locators' => [
+ [ 'EchoUserLocator::locateFromEventExtra', [
'new-publishers-id' ] ]
+ ],
'presentation-model' =>
'EchoNewsletterPublisherPresentationModel',
'title-message' =>
'newsletter-notification-new-publisher-title',
- 'title-params' => array( 'newsletter-name', 'agent' ),
+ 'title-params' => [ 'newsletter-name', 'agent' ],
'flyout-message' =>
'newsletter-notification-new-publisher-flyout',
- 'flyout-params' => array( 'newsletter-name', 'agent' ),
- );
- $notifications['newsletter-subscribed'] = array(
+ 'flyout-params' => [ 'newsletter-name', 'agent' ],
+ ];
+ $notifications['newsletter-subscribed'] = [
'category' => 'newsletter',
- 'primary-link' => array(
+ 'primary-link' => [
'message' =>
'newsletter-notification-subscribed',
'destination' => 'newsletter'
- ),
- 'user-locators' => array(
- array( 'EchoUserLocator::locateFromEventExtra',
array( 'new-subscribers-id' ) )
- ),
+ ],
+ 'user-locators' => [
+ [ 'EchoUserLocator::locateFromEventExtra', [
'new-subscribers-id' ] ]
+ ],
'presentation-model' =>
'EchoNewsletterSubscribedPresentationModel',
'title-message' => 'newsletter-notification-subscribed',
- 'title-params' => array( 'newsletter-name'),
- );
- $notifications['newsletter-unsubscribed'] = array(
+ 'title-params' => [ 'newsletter-name' ],
+ ];
+ $notifications['newsletter-unsubscribed'] = [
'category' => 'newsletter',
- 'primary-link' => array(
+ 'primary-link' => [
'message' =>
'newsletter-notification-unsubscribed',
'destination' => 'newsletter'
- ),
- 'user-locators' => array(
- array( 'EchoUserLocator::locateFromEventExtra',
array( 'removed-subscribers-id' ) )
- ),
+ ],
+ 'user-locators' => [
+ [ 'EchoUserLocator::locateFromEventExtra', [
'removed-subscribers-id' ] ]
+ ],
'presentation-model' =>
'EchoNewsletterUnsubscribedPresentationModel',
'title-message' =>
'newsletter-notification-unsubscribed',
- 'title-params' => array( 'newsletter-name'),
- );
+ 'title-params' => [ 'newsletter-name' ],
+ ];
return true;
}
@@ -129,7 +129,7 @@
/**
* @var SplFileInfo $fileInfo
*/
- $ourFiles = array();
+ $ourFiles = [];
foreach ( new RecursiveIteratorIterator( $directoryIterator )
as $fileInfo ) {
if ( substr( $fileInfo->getFilename(), -8 ) ===
'Test.php' ) {
$ourFiles[] = $fileInfo->getPathname();
@@ -149,8 +149,8 @@
* @return bool
*/
public static function onUserMergeAccountFields( array &$updateFields )
{
- $updateFields[] = array( 'nl_publishers', 'nlp_publisher_id' );
- $updateFields[] = array( 'nl_subscriptions',
'nls_subscriber_id' );
+ $updateFields[] = [ 'nl_publishers', 'nlp_publisher_id' ];
+ $updateFields[] = [ 'nl_subscriptions', 'nls_subscriber_id' ];
return true;
}
@@ -211,7 +211,7 @@
* @return bool
* @throws PermissionsError
*/
- public static function onArticleDelete( &$wikiPage, &$user, &$reason,
&$error, Status &$status, $suppress) {
+ public static function onArticleDelete( &$wikiPage, &$user, &$reason,
&$error, Status &$status, $suppress ) {
if ( !$wikiPage->getTitle()->inNamespace( NS_NEWSLETTER ) ) {
return true;
}
@@ -255,7 +255,7 @@
foreach ( $rows as $row ) {
if ( (int)$row->nl_main_page_id ===
$newsletter->getPageId() && (int)$row->nl_active === 1 ) {
- throw new ErrorPageError(
'newsletter-mainpage-in-use','newsletter-mainpage-in-use-title' );
+ throw new ErrorPageError(
'newsletter-mainpage-in-use', 'newsletter-mainpage-in-use-title' );
}
}
$success = $store->restoreNewsletter( $newsletterName );
@@ -296,7 +296,7 @@
* @param $ok Output parameter, whether it is OK to use $contentModel
on $title.
* @return bool
*/
- public static function onContentModelCanBeUsedOn( $contentModel, Title
$title, &$ok ){
+ public static function onContentModelCanBeUsedOn( $contentModel, Title
$title, &$ok ) {
if ( $title->inNamespace( NS_NEWSLETTER ) && $contentModel !=
'NewsletterContent' ) {
$ok = false;
} elseif ( !$title->inNamespace( NS_NEWSLETTER ) &&
$contentModel == 'NewsletterContent' ) {
diff --git a/includes/Echo/BaseNewsletterPresentationModel.php
b/includes/Echo/BaseNewsletterPresentationModel.php
index 51507bb..d88c6f5 100644
--- a/includes/Echo/BaseNewsletterPresentationModel.php
+++ b/includes/Echo/BaseNewsletterPresentationModel.php
@@ -14,7 +14,7 @@
return $this->event->getExtraParam( 'newsletter-name' );
}
- protected function getNewsletterUrl(){
+ protected function getNewsletterUrl() {
return Title::makeTitleSafe( NS_NEWSLETTER,
$this->getNewsletterName() )->getFullURL();
}
}
diff --git a/includes/Echo/EchoNewsletterPresentationModel.php
b/includes/Echo/EchoNewsletterPresentationModel.php
index 2a586c5..b5fd6fb 100644
--- a/includes/Echo/EchoNewsletterPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPresentationModel.php
@@ -15,19 +15,19 @@
}
public function getPrimaryLink() {
- return array(
+ return [
'url' => $this->event->getTitle()->getFullURL(),
'label' => $this->msg(
'newsletter-notification-link-text-new-issue' )
- );
+ ];
}
public function getSecondaryLinks() {
- return array(
- array(
+ return [
+ [
'url' => $this->getNewsletterUrl(),
'label' => $this->msg(
'newsletter-notification-link-text-view-newsletter' )
- ),
- );
+ ],
+ ];
}
public function getHeaderMessage() {
diff --git a/includes/Echo/EchoNewsletterPublisherPresentationModel.php
b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
index ea6eaaf..d1994d9 100644
--- a/includes/Echo/EchoNewsletterPublisherPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPublisherPresentationModel.php
@@ -7,10 +7,10 @@
}
public function getPrimaryLink() {
- return array(
+ return [
'url' => $this->getNewsletterUrl(),
'label' => $this->msg(
'newsletter-notification-link-text-new-publisher' )->text()
- );
+ ];
}
public function getHeaderMessage() {
diff --git a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
index 24c4365..3a9ff32 100644
--- a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
@@ -7,11 +7,11 @@
}
public function getPrimaryLink() {
- return array(
+ return [
'url' => $this->getNewsletterUrl(),
'label' => $this->msg(
'newsletter-notification-subscribed' )
->params( $this->getNewsletterName() )
- );
+ ];
}
public function getHeaderMessage() {
diff --git a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
index 9431cce..b050aa5 100644
--- a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
@@ -7,11 +7,11 @@
}
public function getPrimaryLink() {
- return array(
+ return [
'url' => $this->getNewsletterUrl(),
'label' => $this->msg(
'newsletter-notification-unsubscribed' )
->params( $this->getNewsletterName() )
- );
+ ];
}
public function getHeaderMessage() {
diff --git a/includes/Echo/EchoNewsletterUserLocator.php
b/includes/Echo/EchoNewsletterUserLocator.php
index ce96509..80a3943 100644
--- a/includes/Echo/EchoNewsletterUserLocator.php
+++ b/includes/Echo/EchoNewsletterUserLocator.php
@@ -11,7 +11,7 @@
$extra = $event->getExtra();
$newsletter = Newsletter::newFromID(
(int)$extra['newsletter-id'] );
if ( !$newsletter ) {
- return array();
+ return [];
}
return UserArray::newFromIDs( $newsletter->getSubscribers() );
diff --git a/includes/Newsletter.php b/includes/Newsletter.php
index e2a0784..c86301f 100644
--- a/includes/Newsletter.php
+++ b/includes/Newsletter.php
@@ -189,7 +189,7 @@
$store = NewsletterStore::getDefaultInstance();
- if ( $store->addSubscription( $this, array( $user->getId() ) )
) {
+ if ( $store->addSubscription( $this, [ $user->getId() ] ) ) {
return Status::newGood();
} else {
return Status::newFatal( 'newsletter-subscribe-fail',
$this->name );
@@ -206,7 +206,7 @@
public function unsubscribe( User $user ) {
$store = NewsletterStore::getDefaultInstance();
- if ( $store->removeSubscription( $this, array( $user->getId() )
) ) {
+ if ( $store->removeSubscription( $this, [ $user->getId() ] ) ) {
return Status::newGood();
} else {
return Status::newFatal( 'newsletter-unsubscribe-fail',
$this->name );
diff --git a/includes/NewsletterDb.php b/includes/NewsletterDb.php
index 7c5f996..9cf1494 100644
--- a/includes/NewsletterDb.php
+++ b/includes/NewsletterDb.php
@@ -24,15 +24,15 @@
* @return bool success of the action
*/
public function addSubscription( Newsletter $newsletter, $userIds ) {
- $rowData = array();
+ $rowData = [];
foreach ( $userIds as $userId ) {
- $rowData[] = array(
+ $rowData[] = [
'nls_newsletter_id' => $newsletter->getId(),
'nls_subscriber_id' => $userId
- );
+ ];
}
$dbw = $this->lb->getConnection( DB_MASTER );
- $dbw->insert( 'nl_subscriptions', $rowData, __METHOD__, array(
'IGNORE' ) );
+ $dbw->insert( 'nl_subscriptions', $rowData, __METHOD__, [
'IGNORE' ] );
$success = (bool)$dbw->affectedRows();
$this->lb->reuseConnection( $dbw );
@@ -46,10 +46,10 @@
* @return bool success of the action
*/
public function removeSubscription( Newsletter $newsletter, $userIds ) {
- $rowData = array(
+ $rowData = [
'nls_newsletter_id' => $newsletter->getId(),
'nls_subscriber_id' => $userIds
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
$dbw->delete( 'nl_subscriptions', $rowData, __METHOD__ );
@@ -66,13 +66,13 @@
* @return bool success of the action
*/
public function addPublisher( Newsletter $newsletter, User $user ) {
- $rowData = array(
+ $rowData = [
'nlp_newsletter_id' => $newsletter->getId(),
'nlp_publisher_id' => $user->getId(),
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
- $dbw->insert( 'nl_publishers', $rowData, __METHOD__, array(
'IGNORE' ) );
+ $dbw->insert( 'nl_publishers', $rowData, __METHOD__, [ 'IGNORE'
] );
$success = (bool)$dbw->affectedRows();
$this->lb->reuseConnection( $dbw );
@@ -88,10 +88,10 @@
* @return bool success of the action
*/
public function removePublisher( Newsletter $newsletter, User $user ) {
- $rowData = array(
+ $rowData = [
'nlp_newsletter_id' => $newsletter->getId(),
'nlp_publisher_id' => $user->getId(),
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
$dbw->delete( 'nl_publishers', $rowData, __METHOD__ );
@@ -108,11 +108,11 @@
* @return bool|int the id of the newsletter added, false on failure
*/
public function addNewsletter( Newsletter $newsletter ) {
- $rowData = array(
+ $rowData = [
'nl_name' => $newsletter->getName(),
'nl_desc' => $newsletter->getDescription(),
'nl_main_page_id' => $newsletter->getPageId(),
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
try {
@@ -140,13 +140,13 @@
Assert::parameterType( 'integer', $id, '$id' );
Assert::parameterType( 'string', $description, '$description' );
- $rowData = array(
+ $rowData = [
'nl_desc' => $description,
- );
+ ];
- $conds = array(
+ $conds = [
'nl_id' => $id,
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
try {
@@ -170,13 +170,13 @@
Assert::parameterType( 'integer', $id, '$id' );
Assert::parameterType( 'string', $name, '$name' );
- $rowData = array(
+ $rowData = [
'nl_name' => $name,
- );
+ ];
- $conds = array(
+ $conds = [
'nl_id' => $id,
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
try {
@@ -200,13 +200,13 @@
Assert::parameterType( 'integer', $id, '$id' );
Assert::parameterType( 'integer', $pageId, '$pageId' );
- $rowData = array(
+ $rowData = [
'nl_main_page_id' => $pageId,
- );
+ ];
- $conds = array(
+ $conds = [
'nl_id' => $id,
- );
+ ];
$dbw = $this->lb->getConnection( DB_MASTER );
try {
@@ -230,8 +230,8 @@
$dbw->update(
'nl_newsletters',
- array( 'nl_active' => 0 ),
- array( 'nl_id' => $newsletter->getId() ),
+ [ 'nl_active' => 0 ],
+ [ 'nl_id' => $newsletter->getId() ],
__METHOD__
);
$success = (bool)$dbw->affectedRows();
@@ -253,8 +253,8 @@
$dbw->update(
'nl_newsletters',
- array( 'nl_active' => 1 ),
- array( 'nl_name' => $newsletterName ),
+ [ 'nl_active' => 1 ],
+ [ 'nl_name' => $newsletterName ],
__METHOD__
);
$success = (bool)$dbw->affectedRows();
@@ -275,8 +275,8 @@
$dbr = $this->lb->getConnection( DB_SLAVE );
$res = $dbr->select(
'nl_newsletters',
- array( 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id'
),
- array( 'nl_id' => $id, 'nl_active' => 1 ),
+ [ 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id' ],
+ [ 'nl_id' => $id, 'nl_active' => 1 ],
__METHOD__
);
$this->lb->reuseConnection( $dbr );
@@ -300,8 +300,8 @@
$dbr = $this->lb->getConnectionRef( DB_SLAVE );
$res = $dbr->selectRow(
'nl_newsletters',
- array( 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id'
),
- array( 'nl_name' => $name, 'nl_active' => $active ),
+ [ 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id' ],
+ [ 'nl_name' => $name, 'nl_active' => $active ],
__METHOD__
);
@@ -321,7 +321,7 @@
$result = $dbr->selectFieldValues(
'nl_publishers',
'nlp_publisher_id',
- array( 'nlp_newsletter_id' => $id ),
+ [ 'nlp_newsletter_id' => $id ],
__METHOD__
);
$this->lb->reuseConnection( $dbr );
@@ -342,7 +342,7 @@
$result = $dbr->selectFieldValues(
'nl_subscriptions',
'nls_subscriber_id',
- array( 'nls_newsletter_id' => $id ),
+ [ 'nls_newsletter_id' => $id ],
__METHOD__
);
$this->lb->reuseConnection( $dbr );
@@ -362,8 +362,8 @@
$res = $dbr->select(
'nl_newsletters',
- array( 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id'
),
- array( 'nl_main_page_id' => $id, 'nl_active' => 1 ),
+ [ 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id' ],
+ [ 'nl_main_page_id' => $id, 'nl_active' => 1 ],
__METHOD__
);
$this->lb->reuseConnection( $dbr );
@@ -380,12 +380,12 @@
$dbr = $this->lb->getConnection( DB_SLAVE );
$res = $dbr->select(
- array( 'nl_publishers', 'nl_newsletters' ),
- array( 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id'
),
- array( 'nlp_publisher_id' => $user->getId(),
'nl_active' => 1 ),
+ [ 'nl_publishers', 'nl_newsletters' ],
+ [ 'nl_id', 'nl_name', 'nl_desc', 'nl_main_page_id' ],
+ [ 'nlp_publisher_id' => $user->getId(), 'nl_active' =>
1 ],
__METHOD__,
- array(),
- array( 'nl_newsletters' => array( 'LEFT JOIN',
'nl_id=nlp_newsletter_id' ) )
+ [],
+ [ 'nl_newsletters' => [ 'LEFT JOIN',
'nl_id=nlp_newsletter_id' ] ]
);
$this->lb->reuseConnection( $dbr );
@@ -406,8 +406,8 @@
$res = $dbr->select(
'nl_newsletters',
- array( 'nl_name' ),
- array( 'nl_name' => $name )
+ [ 'nl_name' ],
+ [ 'nl_name' => $name ]
);
$this->lb->reuseConnection( $dbr );
@@ -423,13 +423,13 @@
* @throws MWException
*/
public function newsletterExistsForMainPage( $mainPageId ) {
- Assert::parameterType( 'integer', $mainPageId , '$mainPageId' );
+ Assert::parameterType( 'integer', $mainPageId, '$mainPageId' );
$dbr = $this->lb->getConnection( DB_SLAVE );
$res = $dbr->select(
'nl_newsletters',
- array( 'nl_main_page_id', 'nl_active' ),
- array( 'nl_main_page_id' => $mainPageId )
+ [ 'nl_main_page_id', 'nl_active' ],
+ [ 'nl_main_page_id' => $mainPageId ]
);
$this->lb->reuseConnection( $dbr );
@@ -442,7 +442,7 @@
* @return Newsletter[]
*/
private function getNewslettersFromResult( ResultWrapper $result ) {
- $newsletters = array();
+ $newsletters = [];
foreach ( $result as $row ) {
$newsletters[] = $this->getNewsletterFromRow( $row );
}
@@ -480,21 +480,21 @@
$lastIssueId = (int)$dbw->selectField(
'nl_issues',
'MAX(nli_issue_id)',
- array( 'nli_newsletter_id' => $newsletter->getId() ),
+ [ 'nli_newsletter_id' => $newsletter->getId() ],
__METHOD__,
- array( 'FOR UPDATE' )
+ [ 'FOR UPDATE' ]
);
$nextIssueId = $lastIssueId + 1;
try {
$success = $dbw->insert(
'nl_issues',
- array(
+ [
'nli_issue_id' => $nextIssueId,
'nli_page_id' => $title->getArticleID(),
'nli_newsletter_id' =>
$newsletter->getId(),
'nli_publisher_id' =>
$publisher->getId(),
- ),
+ ],
__METHOD__
);
} catch ( DBQueryError $ex ) {
diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index b5ac4c4..2ba5727 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -10,7 +10,7 @@
protected $newsletter;
- public function __construct( IContextSource $context, Newsletter
$newsletter = null) {
+ public function __construct( IContextSource $context, Newsletter
$newsletter = null ) {
$this->context = $context;
$this->user = $context->getUser();
$this->title = $context->getTitle();
@@ -80,40 +80,40 @@
protected function getManageForm() {
$publishers = UserArray::newFromIDs(
$this->newsletter->getPublishers() );
- $publishersNames = array();
+ $publishersNames = [];
$mainTitle = Title::newFromID( $this->newsletter->getPageId() );
foreach ( $publishers as $publisher ) {
$publishersNames[] = $publisher->getName();
}
- $fields['MainPage'] = array(
+ $fields['MainPage'] = [
'type' => 'title',
'label-message' => 'newsletter-manage-title',
'default' => $mainTitle->getPrefixedText(),
'required' => true,
- );
- $fields['Description'] = array(
+ ];
+ $fields['Description'] = [
'type' => 'textarea',
'label-message' => 'newsletter-manage-description',
'rows' => 6,
'default' => $this->newsletter->getDescription(),
'required' => true,
- );
- $fields['Publishers'] = array(
+ ];
+ $fields['Publishers'] = [
'type' => 'usersmultiselect',
'label-message' => 'newsletter-manage-publishers',
'default' => $publishersNames,
'exists' => true,
- );
- $fields['Summary'] = array(
+ ];
+ $fields['Summary'] = [
'type' => 'text',
'label-message' => 'newsletter-manage-summary',
'required' => false,
- );
- $fields['Confirm'] = array(
+ ];
+ $fields['Confirm'] = [
'type' => 'hidden',
'default' => false,
- );
+ ];
if ( $this->context->getRequest()->wasPosted() ) {
// @todo Make this work properly for double submissions
$fields['Confirm']['default'] = true;
@@ -159,27 +159,27 @@
* @return array
*/
protected function getFormFields() {
- return array(
- 'name' => array(
+ return [
+ 'name' => [
'type' => 'text',
'required' => true,
'label-message' => 'newsletter-name',
'maxlength' => 120,
'default' => $this->title->getText(),
- ),
- 'mainpage' => array(
+ ],
+ 'mainpage' => [
'type' => 'title',
'required' => true,
'label-message' => 'newsletter-title',
- ),
- 'description' => array(
+ ],
+ 'description' => [
'type' => 'textarea',
'required' => true,
'label-message' => 'newsletter-desc',
'rows' => 15,
'maxlength' => 600000,
- ),
- );
+ ],
+ ];
}
/**
@@ -192,11 +192,11 @@
public function attemptSave( array $input ) {
global $wgContLang;
- $data = array(
+ $data = [
'Name' => trim( $input['name'] ),
'Description' => trim( $input['description'] ),
'MainPage' => Title::newFromText( $input['mainpage'] ),
- );
+ ];
$validator = new NewsletterValidator( $data );
$validation = $validator->validate( true );
@@ -210,13 +210,13 @@
$dbr = wfGetDB( DB_SLAVE );
$rows = $dbr->select(
'nl_newsletters',
- array( 'nl_name', 'nl_main_page_id', 'nl_active' ),
+ [ 'nl_name', 'nl_main_page_id', 'nl_active' ],
$dbr->makeList(
- array(
+ [
'nl_name' => $data['Name'],
'nl_main_page_id' => $mainPageId,
'nl_active' => 1
- ),
+ ],
LIST_OR
)
);
@@ -224,7 +224,7 @@
foreach ( $rows as $row ) {
if ( $row->nl_name === $data['Name'] ) {
return Status::newFatal(
'newsletter-exist-error', $data['Name'] );
- } elseif ( (int)$row->nl_main_page_id === $mainPageId
&& (int)$row->nl_active === 1 ) {
+ } elseif ( (int)$row->nl_main_page_id === $mainPageId
&& (int)$row->nl_active === 1 ) {
return Status::newFatal(
'newsletter-mainpage-in-use' );
}
}
@@ -251,7 +251,7 @@
$title,
$data['Description'],
$input['mainpage'],
- array( $this->user->getName() ),
+ [ $this->user->getName() ],
$editSummaryMsg->inContentLanguage()->plain(),
$this->context
);
@@ -292,10 +292,10 @@
return Status::newFatal(
'newsletter-create-mainpage-error' );
}
- $formData = array(
+ $formData = [
'Description' => $description,
'MainPage' => $mainPage,
- );
+ ];
$validator = new NewsletterValidator( $formData );
$validation = $validator->validate( false );
@@ -359,15 +359,15 @@
if ( $added ) {
EchoEvent::create(
- array(
+ [
'type' => 'newsletter-newpublisher',
- 'extra' => array(
+ 'extra' => [
'newsletter-name' =>
$this->newsletter->getName(),
'new-publishers-id' => $added,
'newsletter-id' => $newsletterId
- ),
+ ],
'agent' => $user
- )
+ ]
);
}
@@ -408,7 +408,7 @@
* @return int[]
*/
private static function getIdsFromUsers( $users ) {
- $ids = array();
+ $ids = [];
foreach ( $users as $user ) {
$ids[] = $user->getId();
}
diff --git a/includes/NewsletterStore.php b/includes/NewsletterStore.php
index 7d823ef..456afdb 100644
--- a/includes/NewsletterStore.php
+++ b/includes/NewsletterStore.php
@@ -30,7 +30,7 @@
/**
* @return NewsletterStore instance of NewsletterStore
*/
- public static function getDefaultInstance(){
+ public static function getDefaultInstance() {
if ( !self::$instance ) {
self::$instance = new self(
new NewsletterDb( wfGetLB() ),
diff --git a/includes/NewsletterValidator.php b/includes/NewsletterValidator.php
index 8404a81..f24fc9f 100644
--- a/includes/NewsletterValidator.php
+++ b/includes/NewsletterValidator.php
@@ -5,16 +5,16 @@
class NewsletterValidator {
- private static $requiredDataOnCreate = array(
+ private static $requiredDataOnCreate = [
'Name',
'Description',
'MainPage',
- );
+ ];
- private static $requiredDataOnEdit = array(
+ private static $requiredDataOnEdit = [
'Description',
'MainPage',
- );
+ ];
/**
* Constructor.
@@ -34,7 +34,7 @@
public function validate( $new ) {
$requiredFields = $new ? self::$requiredDataOnCreate :
self::$requiredDataOnEdit;
// Check whether required fields are not empty
- foreach ( $requiredFields as $field ) {
+ foreach ( $requiredFields as $field ) {
if ( !isset( $this->data[ $field ] ) || trim(
$this->data[ $field ] ) === '' ) {
return Status::newFatal(
'newsletter-input-required' );
}
diff --git a/includes/api/ApiNewsletterManage.php
b/includes/api/ApiNewsletterManage.php
index a45f57f..5b3e917 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -45,40 +45,40 @@
// Success
$this->getResult()->addValue( null, $this->getModuleName(),
- array(
+ [
'id' => $newsletter->getId(),
'name' => $newsletter->getName(),
- )
+ ]
);
}
public function getAllowedParams() {
- return array(
- 'id' => array(
+ return [
+ 'id' => [
ApiBase::PARAM_TYPE => 'integer',
ApiBase::PARAM_REQUIRED => true,
- ),
- 'do' => array(
- ApiBase::PARAM_TYPE => array( 'addpublisher',
'removepublisher' ),
+ ],
+ 'do' => [
+ ApiBase::PARAM_TYPE => [ 'addpublisher',
'removepublisher' ],
ApiBase::PARAM_REQUIRED => true,
- ),
- 'publisher' => array(
+ ],
+ 'publisher' => [
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_REQUIRED => true,
- ),
- );
+ ],
+ ];
}
/**
* @see ApiBase::getExamplesMessages()
*/
protected function getExamplesMessages() {
- return array(
+ return [
'action=newslettermanage&id=1&do=addpublisher&publisher=3'
=> 'apihelp-newslettermanage-example-1',
'action=newslettermanage&id=2&do=removepublisher&publisher=5'
=> 'apihelp-newslettermanage-example-2',
- );
+ ];
}
public function isWriteMode() {
diff --git a/includes/api/ApiNewsletterSubscribe.php
b/includes/api/ApiNewsletterSubscribe.php
index b144a3d..5937b83 100644
--- a/includes/api/ApiNewsletterSubscribe.php
+++ b/includes/api/ApiNewsletterSubscribe.php
@@ -33,36 +33,36 @@
}
$this->getResult()->addValue( null, $this->getModuleName(),
- array(
+ [
'id' => $newsletter->getId(),
'name' => $newsletter->getName(),
- )
+ ]
);
}
public function getAllowedParams() {
- return array(
- 'id' => array(
+ return [
+ 'id' => [
ApiBase::PARAM_TYPE => 'integer',
ApiBase::PARAM_REQUIRED => true,
- ),
- 'do' => array(
- ApiBase::PARAM_TYPE => array( 'subscribe',
'unsubscribe' ),
+ ],
+ 'do' => [
+ ApiBase::PARAM_TYPE => [ 'subscribe',
'unsubscribe' ],
ApiBase::PARAM_REQUIRED => true,
- ),
- );
+ ],
+ ];
}
/**
* @see ApiBase::getExamplesMessages()
*/
protected function getExamplesMessages() {
- return array(
+ return [
'action=newslettersubscribe&id=1&do=subscribe'
=> 'apihelp-newslettersubscribe-example-1',
'action=newslettersubscribe&id=2&do=unsubscribe'
=> 'apihelp-newslettersubscribe-example-2',
- );
+ ];
}
public function isWriteMode() {
diff --git a/includes/content/NewsletterContent.php
b/includes/content/NewsletterContent.php
index 02890a0..b4ca299 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -79,7 +79,7 @@
if ( $data ) {
$this->description = isset( $data->description ) ?
$data->description : null;
$this->mainPage = isset( $data->mainpage ) ?
$data->mainpage : null;
- if ( isset( $data->publishers ) && is_array(
$data->publishers ) ) {
+ if ( isset( $data->publishers ) && is_array(
$data->publishers ) ) {
$this->publishers = [];
foreach ( $data->publishers as $publisher ) {
if ( !is_string( $publisher ) ) {
@@ -128,39 +128,39 @@
if ( !$this->newsletter ) {
throw new MWException( 'Cannot find newsletter
with name \"' . $title->getText() . '\"' );
}
- //Make sure things are decoded at this point
+ // Make sure things are decoded at this point
$this->decode();
$newsletterActionButtons =
$this->getNewsletterActionButtons( $options );
$mainTitle = Title::newFromText( $this->mainPage );
- $fields = array(
- 'mainpage' => array(
+ $fields = [
+ 'mainpage' => [
'type' => 'info',
'label-message' =>
'newsletter-view-mainpage',
'default' =>
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( $mainTitle ),
'raw' => true,
- ),
- 'description' => array(
+ ],
+ 'description' => [
'type' => 'info',
'label-message' =>
'newsletter-view-description',
'default' => $this->description,
'rows' => 6,
'readonly' => true,
- ),
- 'publishers' => array(
+ ],
+ 'publishers' => [
'type' => 'info',
'label' => wfMessage(
'newsletter-view-publishers' )->inLanguage(
$options->getUserLangObj() )
->numParams( count(
$this->publishers ) )
->text(),
- ),
- 'subscribers' => array(
+ ],
+ 'subscribers' => [
'type' => 'info',
'label-message' =>
'newsletter-view-subscriber-count',
'default' =>
$options->getUserLangObj()->formatNum( $this->newsletter->getSubscriberCount()
),
- ),
- );
+ ],
+ ];
$publishersArray = $this->getPublishersFromJSONData(
$this->publishers );
if ( $publishersArray && count( $publishersArray ) > 0
) {
// Have this here to avoid calling unneeded
functions
@@ -180,22 +180,22 @@
'newsletter',
SpecialPage::getTitleFor( 'Newsletter',
$this->newsletter->getId() ),
'',
- array(
+ [
'lim' => 10,
'showIfEmpty' => false,
- 'conds' => array( 'log_action' =>
'issue-added' ),
- 'extraUrlParams' => array( 'subtype' =>
'issue-added' ),
- )
+ 'conds' => [ 'log_action' =>
'issue-added' ],
+ 'extraUrlParams' => [ 'subtype' =>
'issue-added' ],
+ ]
);
if ( $logCount !== 0 ) {
- $fields['issues'] = array(
+ $fields['issues'] = [
'type' => 'info',
'raw' => true,
'default' => $logs,
'label' => wfMessage(
'newsletter-view-issues-log' )
->inLanguage(
$options->getUserLangObj() )
->numParams( $logCount
)->text(),
- );
+ ];
}
$form = $this->getHTMLForm(
$fields,
@@ -244,61 +244,61 @@
// We are building the 'Subscribe' action button for anonymous
users as well
$user = $options->getUser() ? : null;
$id = $this->newsletter->getId();
- $buttons = array();
+ $buttons = [];
$wgOut->enableOOUI();
if ( !$user || ( $user && !$this->newsletter->isSubscribed(
$user ) ) ) {
$buttons[] = new OOUI\ButtonWidget(
- array(
+ [
'label' => $wgOut->msg(
'newsletter-subscribe-button' )->text(),
- 'flags' => array( 'constructive' ),
+ 'flags' => [ 'constructive' ],
'href' => SpecialPage::getTitleFor(
'Newsletter', $id. '/' .
self::NEWSLETTER_SUBSCRIBE
)->getFullURL()
- )
+ ]
);
- } else if ( $this->newsletter->isSubscribed( $user ) ){
+ } elseif ( $this->newsletter->isSubscribed( $user ) ){
$buttons[] = new OOUI\ButtonWidget(
- array(
+ [
'label' => $wgOut->msg(
'newsletter-unsubscribe-button' )->text(),
- 'flags' => array( 'destructive' ),
+ 'flags' => [ 'destructive' ],
'href' => SpecialPage::getTitleFor(
'Newsletter', $id. '/' .
self::NEWSLETTER_UNSUBSCRIBE
)->getFullURL()
- )
+ ]
);
}
if ( $user && $this->newsletter->canManage( $user ) ) {
$buttons[] = new OOUI\ButtonWidget(
- array(
+ [
'label' => $wgOut->msg(
'newsletter-manage-button' )->text(),
'icon' => 'settings',
'href' => Title::makeTitleSafe(
NS_NEWSLETTER, $this->newsletter->getName() )->getEditURL(),
- )
+ ]
);
$buttons[] = new OOUI\ButtonWidget(
- array(
+ [
'label' => $wgOut->msg(
'newsletter-subscribers-button' )->text(),
'icon' => 'info',
'href' => SpecialPage::getTitleFor(
'Newsletter', $id. '/' .
self::NEWSLETTER_SUBSCRIBERS
)->getFullURL()
- )
+ ]
);
}
if ( $user && $this->newsletter->isPublisher( $user ) ) {
$buttons[] = new OOUI\ButtonWidget(
- array(
+ [
'label' => $wgOut->msg(
'newsletter-announce-button' )->text(),
'icon' => 'comment',
'href' => SpecialPage::getTitleFor(
'Newsletter', $id. '/' .
self::NEWSLETTER_ANNOUNCE
)->getFullURL()
- )
+ ]
);
}
- $widget = new OOUI\ButtonGroupWidget( array( 'items' =>
$buttons ) );
+ $widget = new OOUI\ButtonGroupWidget( [ 'items' => $buttons ]
);
return $widget->toString();
}
@@ -329,12 +329,12 @@
foreach ( $users as $user ) {
$str .= Html::rawElement(
'li',
- array(),
+ [],
Linker::userLink( $user->getId(),
$user->getName() ) .
Linker::userToolLinks( $user->getId(),
$user->getName() )
);
}
- return Html::rawElement( 'ul', array(), $str );
+ return Html::rawElement( 'ul', [], $str );
}
protected function getNavigationLinks( ParserOptions $options ) {
@@ -348,11 +348,11 @@
);
$user = $options->getUser() ? : null;
- $actions = array();
+ $actions = [];
if ( !$user || !$this->newsletter->isSubscribed( $user ) ) {
$actions[] = self::NEWSLETTER_SUBSCRIBE;
- } else if ( $this->newsletter->isSubscribed( $user ) ) {
+ } elseif ( $this->newsletter->isSubscribed( $user ) ) {
$actions[] = self::NEWSLETTER_UNSUBSCRIBE;
}
if ( $user && $user->isLoggedIn() ) {
@@ -364,7 +364,7 @@
$actions[] = self::NEWSLETTER_SUBSCRIBERS;
}
}
- $links = array();
+ $links = [];
foreach ( $actions as $action ) {
$title = SpecialPage::getTitleFor( 'Newsletter',
$this->newsletter->getId() . '/' . $action );
@@ -376,7 +376,7 @@
if ( $action == self::NEWSLETTER_MANAGE ) {
$title = Title::makeTitleSafe( NS_NEWSLETTER,
$this->newsletter->getName() );
$msg = wfMessage( 'newsletter-subtitlelinks-' .
$action )->text();
- $link = $linkRenderer->makeKnownLink( $title,
$msg, [], ['action'=>'edit'] );
+ $link = $linkRenderer->makeKnownLink( $title,
$msg, [], [ 'action'=>'edit' ] );
}
$links[] = $link;
}
@@ -384,7 +384,7 @@
SpecialPage::getTitleFor( 'Newsletter',
$this->newsletter->getId() ), $this->getEscapedName()
) . ' ' . wfMessage( 'parentheses' )->rawParams(
$options->getUserLangObj()->pipeList( $links ) )->escaped();
- return $wgOut->setSubtitle(
$options->getUserLangObj()->pipeList( array( $listLink, $newsletterLinks ) ) );
+ return $wgOut->setSubtitle(
$options->getUserLangObj()->pipeList( [ $listLink, $newsletterLinks ] ) );
}
/**
@@ -430,8 +430,7 @@
global $wgContLang;
$truncatedtext = $wgContLang->truncate(
- preg_replace( "/[\n\r]/", ' ', $this->getDescription()
)
- , max( 0, $maxLength )
+ preg_replace( "/[\n\r]/", ' ', $this->getDescription()
), max( 0, $maxLength )
);
return $truncatedtext;
diff --git a/includes/content/NewsletterDiffEngine.php
b/includes/content/NewsletterDiffEngine.php
index ddad524..a371069 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -31,7 +31,7 @@
);
if ( $mainPageDiff ) {
- if( trim( $mainPageDiff ) !== '' ) {
+ if ( trim( $mainPageDiff ) !== '' ) {
$output .= Html::openElement( 'tr' );
$output .= Html::openElement( 'td',
[ 'colspan' => 4, 'id' =>
'mw-newsletter-diffmainpageheader' ] );
diff --git a/includes/logging/NewsletterLogFormatter.php
b/includes/logging/NewsletterLogFormatter.php
index 032f0ef..86c8562 100644
--- a/includes/logging/NewsletterLogFormatter.php
+++ b/includes/logging/NewsletterLogFormatter.php
@@ -29,7 +29,7 @@
$params[5] = Message::rawParam( $this->makePageLink(
Title::newFromText( $params[5] ) ) );
}
- ksort($params);
+ ksort( $params );
$this->parsedParameters = $params;
return $params;
}
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 44e3217..a92a5f6 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -80,11 +80,11 @@
'newsletter',
$this->getPageTitle( (int)$id ),
'',
- array(
+ [
'showIfEmpty' => false,
- 'conds' => array( 'log_action' =>
'newsletter-removed' ),
+ 'conds' => [ 'log_action' =>
'newsletter-removed' ],
'msgKey' => 'newsletter-deleted-log'
- )
+ ]
);
}
@@ -111,7 +111,7 @@
// Build the links taking the current user's access levels into
account
$user = $this->getUser();
- $actions = array();
+ $actions = [];
if ( $user->isLoggedIn() ) {
$actions[] = $this->newsletter->isSubscribed( $user )
? self::NEWSLETTER_UNSUBSCRIBE
@@ -125,7 +125,7 @@
$actions[] = self::NEWSLETTER_SUBSCRIBERS;
}
- $links = array();
+ $links = [];
foreach ( $actions as $action ) {
$title = $this->getPageTitle(
$this->newsletter->getId() . '/' . $action );
// Messages used here:
'newsletter-subtitlelinks-announce',
@@ -136,7 +136,7 @@
if ( $action == self::NEWSLETTER_MANAGE ) {
$title = Title::makeTitleSafe( NS_NEWSLETTER,
$this->newsletter->getName() );
$msg = $this->msg( 'newsletter-subtitlelinks-'
. $action )->text();
- $link = $linkRenderer->makeKnownLink( $title,
$msg, [], ['action'=>'edit'] );
+ $link = $linkRenderer->makeKnownLink( $title,
$msg, [], [ 'action'=>'edit' ] );
}
if ( $current === $action ) {
$links[] = Linker::makeSelfLinkObj( $title,
htmlspecialchars( $msg ) );
@@ -153,7 +153,7 @@
->rawParams( $this->getLanguage()->pipeList( $links ) )
->text();
- return $this->getLanguage()->pipeList( array( $listLink,
$newsletterLinks ) );
+ return $this->getLanguage()->pipeList( [ $listLink,
$newsletterLinks ] );
}
/**
@@ -200,31 +200,31 @@
// User is subscribed so show the unsubscribe form
$txt = $this->msg( 'newsletter-subscribe-text' )
->rawParams( $this->getEscapedName() )->parse();
- $button = array(
- 'unsubscribe' => array(
+ $button = [
+ 'unsubscribe' => [
'type' => 'submit',
'name' => 'unsubscribe',
'default' => $this->msg(
'newsletter-do-unsubscribe' )->text(),
'id' => 'mw-newsletter-unsubscribe',
- 'flags' => array( 'primary',
'destructive' ),
- )
- );
+ 'flags' => [ 'primary', 'destructive' ],
+ ]
+ ];
} else {
// Show the subscribe form if the user is not
subscribed currently
$txt = $this->msg( 'newsletter-subscribe-text' )
->rawParams( $this->getEscapedName() )->parse();
- $button = array(
- 'subscribe' => array(
+ $button = [
+ 'subscribe' => [
'type' => 'submit',
'name' => 'subscribe',
'default' => $this->msg(
'newsletter-do-subscribe' )->text(),
'id' => 'mw-newsletter-subscribe',
- 'flags' => array( 'primary',
'constructive' ),
- )
- );
+ 'flags' => [ 'primary', 'constructive'
],
+ ]
+ ];
}
- $form = $this->getHTMLForm( $button, array( $this,
'submitSubscribeForm' ) );
+ $form = $this->getHTMLForm( $button, [ $this,
'submitSubscribeForm' ] );
$form->addHeaderText( $txt );
$form->suppressDefaultSubmit();
$form->show();
@@ -285,7 +285,7 @@
if ( !$this->newsletter->isPublisher( $user ) ) {
$out->showPermissionsErrorPage(
- array( array(
'newsletter-announce-nopermission' ) )
+ [ [ 'newsletter-announce-nopermission' ] ]
);
return;
}
@@ -295,28 +295,28 @@
->rawParams( $this->getEscapedName() )
);
- $fields = array(
- 'issuepage' => array(
+ $fields = [
+ 'issuepage' => [
'type' => 'title',
'name' => 'issuepage',
'creatable' => true,
'required' => true,
'label-message' =>
'newsletter-announce-issuetitle',
'default' => '',
- ),
- 'summary' => array(
+ ],
+ 'summary' => [
// @todo add a help message explaining what
this does
'type' => 'text',
'name' => 'summary',
'label-message' =>
'newsletter-announce-summary',
'maxlength' => '160',
'autofocus' => true,
- ),
- );
+ ],
+ ];
$form = $this->getHTMLForm(
$fields,
- array( $this, 'submitAnnounceForm' )
+ [ $this, 'submitAnnounceForm' ]
);
$form->setSubmitTextMsg( 'newsletter-announce-submit' );
@@ -349,7 +349,6 @@
if ( !$title ) {
return Status::newFatal(
'newsletter-announce-invalid-page' );
}
-
if ( !$title->exists() ) {
return Status::newFatal(
'newsletter-announce-nonexistent-page' );
@@ -388,17 +387,17 @@
}
EchoEvent::create(
- array(
+ [
'type' => 'newsletter-announce',
'title' => $title,
- 'extra' => array(
+ 'extra' => [
'newsletter-name' =>
$this->newsletter->getName(),
'newsletter-id' =>
$this->newsletter->getId(),
'section-text' => $summary,
'notifyAgent' => true,
- ),
+ ],
'agent' => $user,
- )
+ ]
);
// Yay!
@@ -414,30 +413,30 @@
if ( !$this->newsletter->canManage( $user ) ) {
$out->showPermissionsErrorPage(
- array( array(
'newsletter-subscribers-nopermission' ) )
+ [ [ 'newsletter-subscribers-nopermission' ] ]
);
return;
}
$out->setPageTitle( $this->msg( 'newsletter-subscribers'
)->text() );
$subscribers = UserArray::newFromIDs(
$this->newsletter->getSubscribers() );
- $subscribersNames = array();
+ $subscribersNames = [];
foreach ( $subscribers as $subscriber ) {
$subscribersNames[] = $subscriber->getName();
}
- $fields = array(
- 'subscribers' => array(
+ $fields = [
+ 'subscribers' => [
'type' => 'textarea',
'raw' => true,
'rows' => 10,
'default' => implode( "\n", $subscribersNames )
- ),
- );
+ ],
+ ];
$form = $this->getHTMLForm(
$fields,
- array( $this, 'submitSubscribersForm' )
+ [ $this, 'submitSubscribersForm' ]
);
if ( $form->show() ) {
$out->addReturnTo( Title::makeTitleSafe( NS_NEWSLETTER,
$this->newsletter->getName() ) );
@@ -458,7 +457,7 @@
$subscriberNames = array_unique( array_filter( array_map(
'trim', $subscriberNames ) ) );
$oldSubscribersIds = $this->newsletter->getSubscribers();
- $newSubscribersIds = array();
+ $newSubscribersIds = [];
foreach ( $subscriberNames as $subscriberName ) {
$user = User::newFromName( $subscriberName );
@@ -483,33 +482,33 @@
$out = $this->getOutput();
// Now report to the user
if ( $added || $removed ) {
- if ( !class_exists( 'EchoEvent') ) {
+ if ( !class_exists( 'EchoEvent' ) ) {
throw new Exception( 'Echo extension is not
installed.' );
}
if ( $added ) {
EchoEvent::create(
- array(
+ [
'type' =>
'newsletter-subscribed',
- 'extra' => array(
+ 'extra' => [
'newsletter-name' =>
$this->newsletter->getName(),
'new-subscribers-id' =>
$added,
'newsletter-id' =>
$this->newsletter->getId()
- ),
+ ],
'agent' => $this->getUser()
- )
+ ]
);
}
if ( $removed ) {
EchoEvent::create(
- array(
+ [
'type' =>
'newsletter-unsubscribed',
- 'extra' => array(
+ 'extra' => [
'newsletter-name' =>
$this->newsletter->getName(),
'removed-subscribers-id' => $removed,
'newsletter-id' =>
$this->newsletter->getId()
- ),
+ ],
'agent' => $this->getUser()
- )
+ ]
);
}
$out->addWikiMsg( 'newsletter-edit-subscribers-success'
);
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index 4b0f2a6..ba87302 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -39,27 +39,27 @@
* @return array
*/
protected function getFormFields() {
- return array(
- 'name' => array(
+ return [
+ 'name' => [
'name' => 'newsletter',
'type' => 'text',
'required' => true,
'label-message' => 'newsletter-name',
'maxlength' => 120,
- ),
- 'mainpage' => array(
+ ],
+ 'mainpage' => [
'type' => 'title',
'required' => true,
'label-message' => 'newsletter-title',
- ),
- 'description' => array(
+ ],
+ 'description' => [
'type' => 'textarea',
'required' => true,
'label-message' => 'newsletter-desc',
'rows' => 15,
'maxlength' => 600000,
- ),
- );
+ ],
+ ];
}
/**
@@ -72,11 +72,11 @@
public function onSubmit( array $input ) {
global $wgContLang;
- $data = array(
+ $data = [
'Name' => trim( $input['name'] ),
'Description' => trim( $input['description'] ),
'MainPage' => Title::newFromText( $input['mainpage'] ),
- );
+ ];
$validator = new NewsletterValidator( $data );
$validation = $validator->validate( true );
@@ -90,13 +90,13 @@
$dbr = wfGetDB( DB_SLAVE );
$rows = $dbr->select(
'nl_newsletters',
- array( 'nl_name', 'nl_main_page_id', 'nl_active' ),
+ [ 'nl_name', 'nl_main_page_id', 'nl_active' ],
$dbr->makeList(
- array(
+ [
'nl_name' => $data['Name'],
'nl_main_page_id' => $mainPageId,
'nl_active' => 1
- ),
+ ],
LIST_OR
)
);
@@ -104,7 +104,7 @@
foreach ( $rows as $row ) {
if ( $row->nl_name === $data['Name'] ) {
return Status::newFatal(
'newsletter-exist-error', $data['Name'] );
- } elseif ( (int)$row->nl_main_page_id === $mainPageId
&& (int)$row->nl_active === 1 ) {
+ } elseif ( (int)$row->nl_main_page_id === $mainPageId
&& (int)$row->nl_active === 1 ) {
return Status::newFatal(
'newsletter-mainpage-in-use' );
}
}
@@ -134,7 +134,7 @@
$title,
$data['Description'],
$input['mainpage'],
- array( $user->getName() ),
+ [ $user->getName() ],
$editSummaryMsg->inContentLanguage()->plain(),
$this->getContext()
);
diff --git a/includes/specials/SpecialNewsletters.php
b/includes/specials/SpecialNewsletters.php
index 7e6e940..353830a 100644
--- a/includes/specials/SpecialNewsletters.php
+++ b/includes/specials/SpecialNewsletters.php
@@ -81,19 +81,19 @@
}
private function getFormFields() {
- return array(
- 'filter' => array(
+ return [
+ 'filter' => [
'id' => 'mw-newsletter-filter-options',
'type' => 'select',
'name' => 'filter',
'label-message' => 'newsletter-list-table',
- 'options' => array(
+ 'options' => [
$this->msg(
'newsletter-list-option-all' )->escaped() => 'all',
$this->msg(
'newsletter-list-option-subscribed' )->escaped() => 'subscribed',
$this->msg(
'newsletter-list-option-unsubscribed' )->escaped() => 'unsubscribed'
- ),
+ ],
'default' => $this->option,
- ),
- );
+ ],
+ ];
}
}
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index 62f9679..70b9d11 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -29,11 +29,11 @@
public function getFieldNames() {
if ( $this->fieldNames === null ) {
- $this->fieldNames = array(
+ $this->fieldNames = [
'nl_name' => $this->msg(
'newsletter-header-name' )->text(),
'nl_desc' => $this->msg(
'newsletter-header-description' )->text(),
'subscriber_count' => $this->msg(
'newsletter-header-subscriber_count' )->text(),
- );
+ ];
if ( $this->getUser()->isLoggedIn() ) {
// Only logged-in users can (un)subscribe
@@ -45,23 +45,23 @@
}
public function getQueryInfo() {
- //TODO we could probably just retrieve all subscribers IDs as a
string here.
+ // TODO we could probably just retrieve all subscribers IDs as
a string here.
$userId = $this->getUser()->getId();
$tblSubscriptions = $this->mDb->tableName( 'nl_subscriptions' );
- $info = array(
- 'tables' => array( 'nl_newsletters' ),
- 'fields' => array(
+ $info = [
+ 'tables' => [ 'nl_newsletters' ],
+ 'fields' => [
'nl_name',
'nl_desc',
'nl_id',
'subscribers' => "( SELECT COUNT(*) FROM
$tblSubscriptions WHERE nls_newsletter_id = nl_id )",
- ),
- 'options' => array( 'DISTINCT nl_id' ),
- );
+ ],
+ 'options' => [ 'DISTINCT nl_id' ],
+ ];
- $info['conds'] = array( 'nl_active = 1' );
+ $info['conds'] = [ 'nl_active = 1' ];
if ( $this->option == 'subscribed' ) {
$info['conds'][] = ( $this->mDb->addQuotes( $userId ) .
" IN (SELECT nls_subscriber_id FROM
$tblSubscriptions WHERE nls_newsletter_id = nl_id )" );
@@ -97,7 +97,7 @@
case 'subscriber_count':
return Html::element(
'span',
- array( 'id' => "nl-count-$id" ),
+ [ 'id' => "nl-count-$id" ],
$this->mCurrentRow->subscribers
);
case 'action' :
@@ -107,10 +107,10 @@
);
$link = $linkRenderer->makeKnownLink(
$title,
$this->msg(
'newsletter-unsubscribe-button' )->text(),
- array(
+ [
'class' =>
'newsletter-subscription newsletter-subscribed',
'data-mw-newsletter-id'
=> $id
- )
+ ]
);
} else {
$title = SpecialPage::getTitleFor(
@@ -119,10 +119,10 @@
$link = $linkRenderer->makeKnownLink(
$title,
$this->msg(
'newsletter-subscribe-button' )->text(),
- array(
+ [
'class' =>
'newsletter-subscription newsletter-unsubscribed',
'data-mw-newsletter-id'
=> $id
- )
+ ]
);
}
diff --git a/maintenance/deleteInactiveNewsletters.php
b/maintenance/deleteInactiveNewsletters.php
index 0fa3dba..9abaa3f 100644
--- a/maintenance/deleteInactiveNewsletters.php
+++ b/maintenance/deleteInactiveNewsletters.php
@@ -24,7 +24,7 @@
$count = $dbw->selectField(
'nl_newsletters',
'COUNT(*)',
- array( 'nl_active' => 0 ),
+ [ 'nl_active' => 0 ],
__METHOD__
);
$this->output( "Found $count inactive newsletters to
delete.\n" );
@@ -37,11 +37,11 @@
$idsToDelete = $dbw->selectFieldValues(
'nl_newsletters',
'nl_id',
- array( 'nl_active' => 0 ),
+ [ 'nl_active' => 0 ],
__METHOD__
);
- if( !$idsToDelete ) {
+ if ( !$idsToDelete ) {
$this->output( "No newsletters found to be deleted" );
return;
}
diff --git a/tests/NewsletterDbTest.php b/tests/NewsletterDbTest.php
index c04b5fb..2bc4de9 100644
--- a/tests/NewsletterDbTest.php
+++ b/tests/NewsletterDbTest.php
@@ -36,7 +36,7 @@
->method( 'insert' )
->with(
'nl_subscriptions',
- array( array( 'nls_subscriber_id' =>
$user->getId(), 'nls_newsletter_id' => 1 ) )
+ [ [ 'nls_subscriber_id' => $user->getId(),
'nls_newsletter_id' => 1 ] ]
);
$mockWriteDb->expects( $this->once() )
->method( 'affectedRows' )
@@ -47,7 +47,7 @@
$mainPage = Title::newFromText( "Test content" );
$newsletter = new Newsletter( 1, 'Test name', 'This is a test
description. This is a more test description',
$mainPage->getArticleID() );
- $result = $table->addSubscription( $newsletter, array(
$user->getId() ) );
+ $result = $table->addSubscription( $newsletter, [
$user->getId() ] );
$this->assertEquals( true, $result );
}
diff --git a/tests/api/ApiNewsletterTest.php b/tests/api/ApiNewsletterTest.php
index c1ad3af..ca3508c 100644
--- a/tests/api/ApiNewsletterTest.php
+++ b/tests/api/ApiNewsletterTest.php
@@ -13,7 +13,7 @@
*/
class ApiNewsletterTest extends ApiTestCase {
- public function __construct( $name = null, array $data = array(),
$dataName = '' ) {
+ public function __construct( $name = null, array $data = [], $dataName
= '' ) {
parent::__construct( $name, $data, $dataName );
$this->tablesUsed[] = 'nl_newsletters';
@@ -27,11 +27,11 @@
$user = self::$users['sysop']->getUser();
$this->doLogin( 'sysop' );
- $rowData = array(
+ $rowData = [
'nl_name' => 'MyNewsletter',
'nl_desc' => 'This is a newsletter',
'nl_main_page_id' => 1
- );
+ ];
$dbw->insert( 'nl_newsletters', $rowData, __METHOD__ );
}
@@ -39,10 +39,10 @@
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'nl_newsletters',
- array( 'nl_id' ),
- array(
+ [ 'nl_id' ],
+ [
'nl_name' => 'MyNewsletter',
- ),
+ ],
__METHOD__
);
$newsletterId = null;
@@ -55,20 +55,20 @@
public function testApiNewsletterForSubscribingNewsletter() {
$this->doApiRequestWithToken(
- array(
+ [
'action' => 'newslettersubscribe',
'id' => $this->getNewsletterId(),
'do' => 'subscribe',
- )
+ ]
);
$dbr = wfGetDB( DB_SLAVE );
$result = $dbr->selectRowCount(
'nl_subscriptions',
- array( 'subscriber_id' ),
- array(
+ [ 'subscriber_id' ],
+ [
'nls_newsletter_id' => $this->getNewsletterId(),
- ),
+ ],
__METHOD__
);
@@ -77,28 +77,28 @@
public function testApiNewsletterForUnsubscribingNewsletter() {
$this->doApiRequestWithToken(
- array(
+ [
'action' => 'newslettersubscribe',
'id' => $this->getNewsletterId(),
'do' => 'subscribe',
- )
+ ]
);
$this->doApiRequestWithToken(
- array(
+ [
'action' => 'newslettersubscribe',
'id' => $this->getNewsletterId(),
'do' => 'unsubscribe',
- )
+ ]
);
$dbr = wfGetDB( DB_SLAVE );
$result = $dbr->selectRowCount(
'nl_subscriptions',
- array( 'subscriber_id' ),
- array(
+ [ 'subscriber_id' ],
+ [
'nls_newsletter_id' => $this->getNewsletterId(),
- ),
+ ],
__METHOD__
);
--
To view, visit https://gerrit.wikimedia.org/r/349281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd2aeddd1e71122f006173c562b446685d7e9125
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
