Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove rendering in model

Browse Source 
[MAILPOET-2899]
This commit is contained in:
Pavel Dohnal
2020-05-26 13:38:28 +02:00
committed by Veljko V
parent 7e0b536ff4
commit c9b1c549c1
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -5,6 +5,7 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Links as LinksTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Links as LinksTask;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes as ShortcodesTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes as ShortcodesTask;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Logging\LoggerFactory; use MailPoet\Logging\LoggerFactory;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Models\Newsletter as NewsletterModel; use MailPoet\Models\Newsletter as NewsletterModel;
@ -12,6 +13,7 @@ use MailPoet\Models\NewsletterSegment as NewsletterSegmentModel;
use MailPoet\Models\SendingQueue as SendingQueueModel; use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Newsletter\Links\Links as NewsletterLinks; use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Newsletter\Renderer\PostProcess\OpenTracking; use MailPoet\Newsletter\Renderer\PostProcess\OpenTracking;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Statistics\GATracking; use MailPoet\Statistics\GATracking;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
@ -34,6 +36,9 @@ class Newsletter {
/** @var LoggerFactory */ /** @var LoggerFactory */
private $loggerFactory; private $loggerFactory;
/** @var Renderer */
private $renderer;
/** @var Emoji */ /** @var Emoji */
private $emoji; private $emoji;
@ -57,6 +62,7 @@ class Newsletter {
$emoji = new Emoji(); $emoji = new Emoji();
} }
$this->emoji = $emoji; $this->emoji = $emoji;
$this->renderer = ContainerWrapper::getInstance()->get(Renderer::class);
} }
public function getNewsletterFromQueue($queue) { public function getNewsletterFromQueue($queue) {
@ -103,7 +109,7 @@ class Newsletter {
// hook to the newsletter post-processing filter and add tracking image // hook to the newsletter post-processing filter and add tracking image
$this->trackingImageInserted = OpenTracking::addTrackingImage(); $this->trackingImageInserted = OpenTracking::addTrackingImage();
// render newsletter // render newsletter
$renderedNewsletter = $newsletter->render(); $renderedNewsletter = $this->renderer->render($newsletter);
$renderedNewsletter = $this->wp->applyFilters( $renderedNewsletter = $this->wp->applyFilters(
'mailpoet_sending_newsletter_render_after', 'mailpoet_sending_newsletter_render_after',
$renderedNewsletter, $renderedNewsletter,
@ -114,7 +120,7 @@ class Newsletter {
$renderedNewsletter = LinksTask::process($renderedNewsletter, $newsletter, $sendingTask); $renderedNewsletter = LinksTask::process($renderedNewsletter, $newsletter, $sendingTask);
} else { } else {
// render newsletter // render newsletter
$renderedNewsletter = $newsletter->render(); $renderedNewsletter = $this->renderer->render($newsletter);
$renderedNewsletter = $this->wp->applyFilters( $renderedNewsletter = $this->wp->applyFilters(
'mailpoet_sending_newsletter_render_after', 'mailpoet_sending_newsletter_render_after',
$renderedNewsletter, $renderedNewsletter,

7
lib/Models/Newsletter.php
View File

@ -6,10 +6,8 @@ use MailPoet\AutomaticEmails\WooCommerce\Events\AbandonedCart;
use MailPoet\AutomaticEmails\WooCommerce\Events\FirstPurchase; use MailPoet\AutomaticEmails\WooCommerce\Events\FirstPurchase;
use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedInCategory; use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedInCategory;
use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedProduct; use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedProduct;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Entities\NewsletterEntity; use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity; use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending as SendingTask; use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
@ -570,11 +568,6 @@ class Newsletter extends Model {
return $this; return $this;
} }
public function render() {
$renderer = ContainerWrapper::getInstance()->get(Renderer::class);
return $renderer->render($this);
}
public function wasScheduledForSubscriber($subscriberId) { public function wasScheduledForSubscriber($subscriberId) {
/** @var \stdClass */ /** @var \stdClass */
$queue = SendingQueue::rawQuery( $queue = SendingQueue::rawQuery(