Add public keyword to methods
[MAILPOET-2413]
This commit is contained in:
@ -13,14 +13,14 @@ use MailPoet\Subscription\SubscriptionUrlFactory;
|
||||
use MailPoet\Util\Helpers;
|
||||
|
||||
class Links {
|
||||
static function process($rendered_newsletter, $newsletter, $queue) {
|
||||
public static function process($rendered_newsletter, $newsletter, $queue) {
|
||||
list($rendered_newsletter, $links) =
|
||||
self::hashAndReplaceLinks($rendered_newsletter, $newsletter->id, $queue->id);
|
||||
self::saveLinks($links, $newsletter, $queue);
|
||||
return $rendered_newsletter;
|
||||
}
|
||||
|
||||
static function hashAndReplaceLinks($rendered_newsletter, $newsletter_id, $queue_id) {
|
||||
public static function hashAndReplaceLinks($rendered_newsletter, $newsletter_id, $queue_id) {
|
||||
// join HTML and TEXT rendered body into a text string
|
||||
$content = Helpers::joinObject($rendered_newsletter);
|
||||
list($content, $links) = NewsletterLinks::process($content, $newsletter_id, $queue_id);
|
||||
@ -34,11 +34,11 @@ class Links {
|
||||
];
|
||||
}
|
||||
|
||||
static function saveLinks($links, $newsletter, $queue) {
|
||||
public static function saveLinks($links, $newsletter, $queue) {
|
||||
return NewsletterLinks::save($links, $newsletter->id, $queue->id);
|
||||
}
|
||||
|
||||
static function getUnsubscribeUrl($queue, $subscriber_id) {
|
||||
public static function getUnsubscribeUrl($queue, $subscriber_id) {
|
||||
$subscriber = Subscriber::where('id', $subscriber_id)->findOne();
|
||||
$settings = SettingsController::getInstance();
|
||||
if ((boolean)$settings->get('tracking.enabled')) {
|
||||
|
@ -8,11 +8,11 @@ use MailPoet\Mailer\MailerLog;
|
||||
class Mailer {
|
||||
public $mailer;
|
||||
|
||||
function __construct($mailer = false) {
|
||||
public function __construct($mailer = false) {
|
||||
$this->mailer = ($mailer) ? $mailer : $this->configureMailer();
|
||||
}
|
||||
|
||||
function configureMailer($newsletter = null) {
|
||||
public function configureMailer($newsletter = null) {
|
||||
$sender['address'] = (!empty($newsletter->sender_address)) ?
|
||||
$newsletter->sender_address :
|
||||
false;
|
||||
@ -36,25 +36,25 @@ class Mailer {
|
||||
return $this->mailer;
|
||||
}
|
||||
|
||||
function getMailerLog() {
|
||||
public function getMailerLog() {
|
||||
return MailerLog::getMailerLog();
|
||||
}
|
||||
|
||||
function updateSentCount() {
|
||||
public function updateSentCount() {
|
||||
return MailerLog::incrementSentCount();
|
||||
}
|
||||
|
||||
function getProcessingMethod() {
|
||||
public function getProcessingMethod() {
|
||||
return ($this->mailer->mailer_config['method'] === MailerFactory::METHOD_MAILPOET) ?
|
||||
'bulk' :
|
||||
'individual';
|
||||
}
|
||||
|
||||
function prepareSubscriberForSending($subscriber) {
|
||||
public function prepareSubscriberForSending($subscriber) {
|
||||
return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
|
||||
}
|
||||
|
||||
function sendBulk($prepared_newsletters, $prepared_subscribers, $extra_params = []) {
|
||||
public function sendBulk($prepared_newsletters, $prepared_subscribers, $extra_params = []) {
|
||||
if ($this->getProcessingMethod() === 'individual') {
|
||||
throw new \LogicException('Trying to send a batch with individual processing method');
|
||||
}
|
||||
@ -65,7 +65,7 @@ class Mailer {
|
||||
);
|
||||
}
|
||||
|
||||
function send($prepared_newsletter, $prepared_subscriber, $extra_params = []) {
|
||||
public function send($prepared_newsletter, $prepared_subscriber, $extra_params = []) {
|
||||
if ($this->getProcessingMethod() === 'bulk') {
|
||||
throw new \LogicException('Trying to send an individual email with a bulk processing method');
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ class Newsletter {
|
||||
/** @var Emoji */
|
||||
private $emoji;
|
||||
|
||||
function __construct(WPFunctions $wp = null, PostsTask $posts_task = null, GATracking $ga_tracking = null, Emoji $emoji = null) {
|
||||
public function __construct(WPFunctions $wp = null, PostsTask $posts_task = null, GATracking $ga_tracking = null, Emoji $emoji = null) {
|
||||
$settings = SettingsController::getInstance();
|
||||
$this->tracking_enabled = (boolean)$settings->get('tracking.enabled');
|
||||
if ($wp === null) {
|
||||
@ -59,7 +59,7 @@ class Newsletter {
|
||||
$this->emoji = $emoji;
|
||||
}
|
||||
|
||||
function getNewsletterFromQueue($queue) {
|
||||
public function getNewsletterFromQueue($queue) {
|
||||
// get existing active or sending newsletter
|
||||
$newsletter = $queue->newsletter()
|
||||
->whereNull('deleted_at')
|
||||
@ -87,7 +87,7 @@ class Newsletter {
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
function preProcessNewsletter(\MailPoet\Models\Newsletter $newsletter, $sending_task) {
|
||||
public function preProcessNewsletter(\MailPoet\Models\Newsletter $newsletter, $sending_task) {
|
||||
// return the newsletter if it was previously rendered
|
||||
if (!is_null($sending_task->getNewsletterRenderedBody())) {
|
||||
return (!$sending_task->validate()) ?
|
||||
@ -167,7 +167,7 @@ class Newsletter {
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
function prepareNewsletterForSending($newsletter, $subscriber, $queue) {
|
||||
public function prepareNewsletterForSending($newsletter, $subscriber, $queue) {
|
||||
// shortcodes and links will be replaced in the subject, html and text body
|
||||
// to speed the processing, join content into a continuous string
|
||||
$rendered_newsletter = $queue->getNewsletterRenderedBody();
|
||||
@ -204,7 +204,7 @@ class Newsletter {
|
||||
];
|
||||
}
|
||||
|
||||
function markNewsletterAsSent($newsletter, $queue) {
|
||||
public function markNewsletterAsSent($newsletter, $queue) {
|
||||
// if it's a standard or notification history newsletter, update its status
|
||||
if ($newsletter->type === NewsletterModel::TYPE_STANDARD ||
|
||||
$newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY
|
||||
@ -215,14 +215,14 @@ class Newsletter {
|
||||
}
|
||||
}
|
||||
|
||||
function getNewsletterSegments($newsletter) {
|
||||
public function getNewsletterSegments($newsletter) {
|
||||
$segments = NewsletterSegmentModel::where('newsletter_id', $newsletter->id)
|
||||
->select('segment_id')
|
||||
->findArray();
|
||||
return Helpers::flattenArray($segments);
|
||||
}
|
||||
|
||||
function stopNewsletterPreProcessing($error_code = null) {
|
||||
public function stopNewsletterPreProcessing($error_code = null) {
|
||||
MailerLog::processError(
|
||||
'queue_save',
|
||||
WPFunctions::get()->__('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.', 'mailpoet'),
|
||||
|
@ -14,7 +14,7 @@ class Posts {
|
||||
$this->logger_factory = LoggerFactory::getInstance();
|
||||
}
|
||||
|
||||
function extractAndSave($rendered_newsletter, $newsletter) {
|
||||
public function extractAndSave($rendered_newsletter, $newsletter) {
|
||||
if ($newsletter->type !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) {
|
||||
return false;
|
||||
}
|
||||
@ -44,7 +44,7 @@ class Posts {
|
||||
return true;
|
||||
}
|
||||
|
||||
function getAlcPostsCount($rendered_newsletter, \MailPoet\Models\Newsletter $newsletter) {
|
||||
public function getAlcPostsCount($rendered_newsletter, \MailPoet\Models\Newsletter $newsletter) {
|
||||
$template_posts_count = substr_count($newsletter->body, 'data-post-id');
|
||||
$newsletter_posts_count = substr_count($rendered_newsletter['html'], 'data-post-id');
|
||||
return $newsletter_posts_count - $template_posts_count;
|
||||
|
@ -5,7 +5,7 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
|
||||
use MailPoet\Newsletter\Shortcodes\Shortcodes as NewsletterShortcodes;
|
||||
|
||||
class Shortcodes {
|
||||
static function process($content, $content_source = null, $newsletter = null, $subscriber = null, $queue = null) {
|
||||
public static function process($content, $content_source = null, $newsletter = null, $subscriber = null, $queue = null) {
|
||||
$shortcodes = new NewsletterShortcodes($newsletter, $subscriber, $queue);
|
||||
return $shortcodes->replace($content, $content_source);
|
||||
}
|
||||
|
Reference in New Issue
Block a user