jenkins-bot has submitted this change and it was merged.
Change subject: Remove duplicate method from NewsletterDb
......................................................................
Remove duplicate method from NewsletterDb
Also fix documentation
Change-Id: I40a5f681527e278f351f179f79755c766e165ea9
---
M includes/Echo/EchoNewsletterUserLocator.php
M includes/NewsletterDb.php
2 files changed, 4 insertions(+), 26 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Echo/EchoNewsletterUserLocator.php
b/includes/Echo/EchoNewsletterUserLocator.php
index b8cb733..285bd24 100644
--- a/includes/Echo/EchoNewsletterUserLocator.php
+++ b/includes/Echo/EchoNewsletterUserLocator.php
@@ -5,12 +5,12 @@
* Locate all users subscribed to a newsletter.
*
* @param EchoEvent $event
- * @return UserArray
+ * @return User[]
*/
public static function locateNewsletterSubscribedUsers( EchoEvent
$event ) {
$extra = $event->getExtra();
$ids = NewsletterDb::newFromGlobalState()
- ->getUserIdsSubscribedToNewsletter(
$extra['newsletterId'] );
+ ->getSubscribersFromID( $extra['newsletterId'] );
return UserArray::newFromIDs( $ids );
diff --git a/includes/NewsletterDb.php b/includes/NewsletterDb.php
index 4c0c26b..15061fe 100644
--- a/includes/NewsletterDb.php
+++ b/includes/NewsletterDb.php
@@ -52,28 +52,6 @@
}
/**
- * @param int $newsletterId
- *
- * @return int[]
- */
- public function getUserIdsSubscribedToNewsletter( $newsletterId ) {
- // @todo use selectFieldValues() here
- $res = $this->readDb->select(
- 'nl_subscriptions',
- array( 'nls_subscriber_id' ),
- array( 'nls_newsletter_id' => $newsletterId ),
- __METHOD__,
- array()
- );
-
- $subscriberIds = array();
- foreach ( $res as $row ) {
- $subscriberIds[] = $row->nls_subscriber_id;
- }
- return $subscriberIds;
- }
-
- /**
* @param int $userId
* @param int $newsletterId
*
@@ -166,7 +144,7 @@
/**
* @param int $id
*
- * @return array
+ * @return string[]
*/
public function getPublishersFromID( $id ) {
return $this->readDb->selectFieldValues(
@@ -180,7 +158,7 @@
/**
* @param int $id
*
- * @return array
+ * @return string[]
*/
public function getSubscribersFromID( $id ) {
return $this->readDb->selectFieldValues(
--
To view, visit https://gerrit.wikimedia.org/r/248339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40a5f681527e278f351f179f79755c766e165ea9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
