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

Rename Newsletters\ViewInBrowser to ViewInBrowserRenderer

Browse Source 
[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-06 12:29:44 +01:00
committed by Jack Kitterhing
parent edb18399a1
commit 88d76d5efa
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DI/ContainerConfigurator.php
View File

@ -240,8 +240,8 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository::class); $container->autowire(\MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository::class);
$container->autowire(\MailPoet\Newsletter\Scheduler\WelcomeScheduler::class); $container->autowire(\MailPoet\Newsletter\Scheduler\WelcomeScheduler::class);
$container->autowire(\MailPoet\Newsletter\Scheduler\PostNotificationScheduler::class); $container->autowire(\MailPoet\Newsletter\Scheduler\PostNotificationScheduler::class);
$container->autowire(\MailPoet\Newsletter\ViewInBrowser::class)->setPublic(true);
$container->autowire(\MailPoet\Newsletter\ViewInBrowser\ViewInBrowserController::class)->setPublic(true); $container->autowire(\MailPoet\Newsletter\ViewInBrowser\ViewInBrowserController::class)->setPublic(true);
$container->autowire(\MailPoet\Newsletter\ViewInBrowser\ViewInBrowserRenderer::class)->setPublic(true);
// Util // Util
$container->autowire(\MailPoet\Util\Cookies::class); $container->autowire(\MailPoet\Util\Cookies::class);
$container->autowire(\MailPoet\Util\Url::class)->setPublic(true); $container->autowire(\MailPoet\Util\Url::class)->setPublic(true);

12
lib/Newsletter/ViewInBrowser/ViewInBrowserController.php
View File

@ -7,7 +7,6 @@ use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser;
use MailPoet\Subscribers\LinkTokens; use MailPoet\Subscribers\LinkTokens;
class ViewInBrowserController { class ViewInBrowserController {
@ -17,17 +16,17 @@ class ViewInBrowserController {
/** @var LinkTokens */ /** @var LinkTokens */
private $linkTokens; private $linkTokens;
/** @var NewsletterViewInBrowser */ /** @var ViewInBrowserRenderer */
private $newsletterViewInBrowser; private $viewInBrowserRenderer;
public function __construct( public function __construct(
AccessControl $accessControl, AccessControl $accessControl,
LinkTokens $linkTokens, LinkTokens $linkTokens,
NewsletterViewInBrowser $newsletterViewInBrowser ViewInBrowserRenderer $viewInBrowserRenderer
) { ) {
$this->accessControl = $accessControl; $this->accessControl = $accessControl;
$this->linkTokens = $linkTokens; $this->linkTokens = $linkTokens;
$this->newsletterViewInBrowser = $newsletterViewInBrowser; $this->viewInBrowserRenderer = $viewInBrowserRenderer;
} }
public function view(array $data) { public function view(array $data) {
@ -62,10 +61,9 @@ class ViewInBrowserController {
throw new \InvalidArgumentException(); throw new \InvalidArgumentException();
} }
return $this->newsletterViewInBrowser->view($isPreview, $newsletter, $subscriber, $queue); return $this->viewInBrowserRenderer->render($isPreview, $newsletter, $subscriber, $queue);
} }
private function getQueue(Newsletter $newsletter, array $data) { private function getQueue(Newsletter $newsletter, array $data) {
// queue is optional; try to find it if it's not defined and this is not a welcome email // queue is optional; try to find it if it's not defined and this is not a welcome email
if ($newsletter->type === Newsletter::TYPE_WELCOME) { if ($newsletter->type === Newsletter::TYPE_WELCOME) {

6
lib/Newsletter/ViewInBrowser.php → lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace MailPoet\Newsletter; namespace MailPoet\Newsletter\ViewInBrowser;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
@ -11,7 +11,7 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\WP\Emoji; use MailPoet\WP\Emoji;
class ViewInBrowser { class ViewInBrowserRenderer {
/** @var Emoji */ /** @var Emoji */
private $emoji; private $emoji;
@ -23,7 +23,7 @@ class ViewInBrowser {
$this->isTrackingEnabled = $settings->get('tracking.enabled'); $this->isTrackingEnabled = $settings->get('tracking.enabled');
} }
public function view( public function render(
bool $isPreview, bool $isPreview,
Newsletter $newsletter, Newsletter $newsletter,
Subscriber $subscriber = null, Subscriber $subscriber = null,