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

Rename property used for a dynamic segments service

Browse Source 
[MAILPOET-3077]
This commit is contained in:
Rostislav Wolny
2020-09-24 14:21:17 +02:00
committed by Veljko V
parent 510921f27e
commit 82ce309df1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/AdminPages/Pages/Newsletters.php
View File

@ -60,7 +60,7 @@ class Newsletters {
private $newsletterTemplatesRepository;
/** @var AddToNewslettersSegments */
private $dynamicSegmentsLoader;
private $addToNewslettersSegments;
public function __construct(
PageRenderer $pageRenderer,
@ -74,7 +74,7 @@ class Newsletters {
SubscribersFeature $subscribersFeature,
ServicesChecker $servicesChecker,
NewsletterTemplatesRepository $newsletterTemplatesRepository,
AddToNewslettersSegments $dynamicSegmentsLoader
AddToNewslettersSegments $addToNewslettersSegments
) {
$this->pageRenderer = $pageRenderer;
$this->listingPageLimit = $listingPageLimit;
@ -87,7 +87,7 @@ class Newsletters {
$this->subscribersFeature = $subscribersFeature;
$this->servicesChecker = $servicesChecker;
$this->newsletterTemplatesRepository = $newsletterTemplatesRepository;
$this->dynamicSegmentsLoader = $dynamicSegmentsLoader;
$this->addToNewslettersSegments = $addToNewslettersSegments;
}
public function render() {
@ -106,7 +106,7 @@ class Newsletters {
$data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters');
$segments = Segment::getSegmentsWithSubscriberCount($type = false);
$segments = $this->dynamicSegmentsLoader->add($segments);
$segments = $this->addToNewslettersSegments->add($segments);
usort($segments, function ($a, $b) {
return strcasecmp($a["name"], $b["name"]);
});

6
lib/Subscribers/ImportExport/ImportExportFactory.php
View File

@ -16,11 +16,11 @@ class ImportExportFactory {
public $action;
/** @var AddToNewslettersSegments */
private $dynamicSegmentsLoader;
private $addToNewslettersSegments;
public function __construct($action = null) {
$this->action = $action;
$this->dynamicSegmentsLoader = ContainerWrapper::getInstance()->get(AddToNewslettersSegments::class);
$this->addToNewslettersSegments = ContainerWrapper::getInstance()->get(AddToNewslettersSegments::class);
}
public function getSegments() {
@ -28,7 +28,7 @@ class ImportExportFactory {
$segments = Segment::getSegmentsForImport();
} else {
$segments = Segment::getSegmentsForExport();
$segments = $this->dynamicSegmentsLoader->add($segments);
$segments = $this->addToNewslettersSegments->add($segments);
$segments = array_values(array_filter($segments, function($segment) {
return $segment['subscribers'] > 0;
}));