Load dynamic segments for list directly without hook

[MAILPOET-3077]

lib/AdminPages/Pages/Newsletters.php

@@ -7,6 +7,7 @@ use MailPoet\Config\Env;
 use MailPoet\Config\Installer;
 use MailPoet\Config\Menu;
 use MailPoet\Config\ServicesChecker;
+use MailPoet\DynamicSegments\FreePluginConnectors\AddToNewslettersSegments;
 use MailPoet\Features\FeaturesController;
 use MailPoet\Listing\PageLimit;
 use MailPoet\Models\Newsletter;
@@ -58,6 +59,9 @@ class Newsletters {
   /** @var NewsletterTemplatesRepository */
   private $newsletterTemplatesRepository;
 
+  /** @var AddToNewslettersSegments */
+  private $dynamicSegmentsLoader;
+
   public function __construct(
     PageRenderer $pageRenderer,
     PageLimit $listingPageLimit,
@@ -69,7 +73,8 @@ class Newsletters {
     FeaturesController $featuresController,
     SubscribersFeature $subscribersFeature,
     ServicesChecker $servicesChecker,
-    NewsletterTemplatesRepository $newsletterTemplatesRepository
+    NewsletterTemplatesRepository $newsletterTemplatesRepository,
+    AddToNewslettersSegments $dynamicSegmentsLoader
   ) {
     $this->pageRenderer = $pageRenderer;
     $this->listingPageLimit = $listingPageLimit;
@@ -82,6 +87,7 @@ class Newsletters {
     $this->subscribersFeature = $subscribersFeature;
     $this->servicesChecker = $servicesChecker;
     $this->newsletterTemplatesRepository = $newsletterTemplatesRepository;
+    $this->dynamicSegmentsLoader = $dynamicSegmentsLoader;
   }
 
   public function render() {
@@ -100,6 +106,7 @@ class Newsletters {
 
     $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters');
     $segments = Segment::getSegmentsWithSubscriberCount($type = false);
+    $segments = $this->dynamicSegmentsLoader->add($segments);
     $segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
     usort($segments, function ($a, $b) {
       return strcasecmp($a["name"], $b["name"]);

lib/AdminPages/Pages/Subscribers.php

@@ -4,6 +4,7 @@ namespace MailPoet\AdminPages\Pages;
 
 use MailPoet\AdminPages\PageRenderer;
 use MailPoet\Config\ServicesChecker;
+use MailPoet\DynamicSegments\FreePluginConnectors\AddToNewslettersSegments;
 use MailPoet\Form\Block;
 use MailPoet\Listing\PageLimit;
 use MailPoet\Models\CustomField;
@@ -34,13 +35,17 @@ class Subscribers {
   /** @var ServicesChecker */
   private $servicesChecker;
 
+  /** @var AddToNewslettersSegments */
+  private $dynamicSegmentsLoader;
+
   public function __construct(
     PageRenderer $pageRenderer,
     PageLimit $listingPageLimit,
     SubscribersFeature $subscribersFeature,
     WPFunctions $wp,
     ServicesChecker $servicesChecker,
-    Block\Date $dateBlock
+    Block\Date $dateBlock,
+    AddToNewslettersSegments $dynamicSegmentsLoader
   ) {
     $this->pageRenderer = $pageRenderer;
     $this->listingPageLimit = $listingPageLimit;
@@ -48,6 +53,7 @@ class Subscribers {
     $this->wp = $wp;
     $this->dateBlock = $dateBlock;
     $this->servicesChecker = $servicesChecker;
+    $this->dynamicSegmentsLoader = $dynamicSegmentsLoader;
   }
 
   public function render() {
@@ -55,6 +61,7 @@ class Subscribers {
 
     $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('subscribers');
     $segments = Segment::getSegmentsWithSubscriberCount($type = false);
+    $segments = $this->dynamicSegmentsLoader->add($segments);
     $segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
     usort($segments, function ($a, $b) {
       return strcasecmp($a["name"], $b["name"]);

lib/DI/ContainerConfigurator.php

@@ -131,6 +131,9 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\PostEditorBlocks\SubscriptionFormBlock::class);
     // Dynamic segments
     $container->autowire(\MailPoet\DynamicSegments\DynamicSegmentHooks::class);
+    $container->autowire(\MailPoet\DynamicSegments\FreePluginConnectors\AddToNewslettersSegments::class);
+    $container->autowire(\MailPoet\DynamicSegments\Persistence\Loading\Loader::class);
+    $container->autowire(\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount::class);
     // Cron
     $container->autowire(\MailPoet\Cron\CronHelper::class)->setPublic(true);
     $container->autowire(\MailPoet\Cron\CronTrigger::class)->setPublic(true);

lib/DynamicSegments/DynamicSegmentHooks.php

@@ -2,7 +2,6 @@
 
 namespace MailPoet\DynamicSegments;
 
-use MailPoet\DynamicSegments\FreePluginConnectors\AddToNewslettersSegments;
 use MailPoet\DynamicSegments\FreePluginConnectors\AddToSubscribersFilters;
 use MailPoet\DynamicSegments\FreePluginConnectors\SendingNewslettersSubscribersFinder;
 use MailPoet\DynamicSegments\FreePluginConnectors\SubscribersBulkActionHandler;
@@ -23,11 +22,6 @@ class DynamicSegmentHooks {
   }
 
   public function init() {
-    $this->wp->addAction(
-      'mailpoet_segments_with_subscriber_count',
-      [$this, 'addSegmentsWithSubscribersCount']
-    );
-
     $this->wp->addAction(
       'mailpoet_get_subscribers_in_segment_finders',
       [$this, 'getSubscribersInSegmentsFinders']
@@ -54,11 +48,6 @@ class DynamicSegmentHooks {
     );
   }
 
-  public function addSegmentsWithSubscribersCount($initialSegments) {
-    $newslettersAddSegments = new AddToNewslettersSegments(new Loader(new DBMapper()), new SubscribersCount());
-    return $newslettersAddSegments->add($initialSegments);
-  }
-
   public function getSubscribersInSegmentsFinders(array $finders) {
     $finders[] = new SendingNewslettersSubscribersFinder(new SingleSegmentLoader(new DBMapper()), new SubscribersIds());
     return $finders;

lib/Subscribers/ImportExport/ImportExportFactory.php

@@ -2,22 +2,25 @@
 
 namespace MailPoet\Subscribers\ImportExport;
 
+use MailPoet\DI\ContainerWrapper;
+use MailPoet\DynamicSegments\FreePluginConnectors\AddToNewslettersSegments;
 use MailPoet\Models\CustomField;
 use MailPoet\Models\Segment;
 use MailPoet\Util\Helpers;
-use MailPoet\WP\Functions as WPFunctions;
 
 class ImportExportFactory {
   const IMPORT_ACTION = 'import';
   const EXPORT_ACTION = 'export';
 
+  /** @var string|null  */
   public $action;
 
-  private $wp;
+  /** @var AddToNewslettersSegments */
+  private $dynamicSegmentsLoader;
 
   public function __construct($action = null) {
     $this->action = $action;
-    $this->wp = new WPFunctions;
+    $this->dynamicSegmentsLoader = ContainerWrapper::getInstance()->get(AddToNewslettersSegments::class);
   }
 
   public function getSegments() {
@@ -25,6 +28,7 @@ class ImportExportFactory {
       $segments = Segment::getSegmentsForImport();
     } else {
       $segments = Segment::getSegmentsForExport();
+      $segments = $this->dynamicSegmentsLoader->add($segments);
       $segments = $this->wp->applyFilters('mailpoet_segments_with_subscriber_count', $segments);
       $segments = array_values(array_filter($segments, function($segment) {
         return $segment['subscribers'] > 0;
@@ -32,7 +36,7 @@ class ImportExportFactory {
     }
 
     return array_map(function($segment) {
-      if (!$segment['name']) $segment['name'] = WPFunctions::get()->__('Not In List', 'mailpoet');
+      if (!$segment['name']) $segment['name'] = __('Not In List', 'mailpoet');
       if (!$segment['id']) $segment['id'] = 0;
       return [
         'id' => $segment['id'],
@@ -45,17 +49,17 @@ class ImportExportFactory {
 
   public function getSubscriberFields() {
     $fields = [
-      'email' => WPFunctions::get()->__('Email', 'mailpoet'),
-      'first_name' => WPFunctions::get()->__('First name', 'mailpoet'),
-      'last_name' => WPFunctions::get()->__('Last name', 'mailpoet'),
+      'email' => __('Email', 'mailpoet'),
+      'first_name' => __('First name', 'mailpoet'),
+      'last_name' => __('Last name', 'mailpoet'),
     ];
     if ($this->action === 'export') {
       $fields = array_merge(
         $fields,
         [
-          'list_status' => WPFunctions::get()->_x('List status', 'Subscription status', 'mailpoet'),
-          'global_status' => WPFunctions::get()->_x('Global status', 'Subscription status', 'mailpoet'),
-          'subscribed_ip' => WPFunctions::get()->__('IP address', 'mailpoet'),
+          'list_status' => _x('List status', 'Subscription status', 'mailpoet'),
+          'global_status' => _x('Global status', 'Subscription status', 'mailpoet'),
+          'subscribed_ip' => __('IP address', 'mailpoet'),
         ]
       );
     }
@@ -96,36 +100,36 @@ class ImportExportFactory {
       [
         [
           'id' => 'ignore',
-          'name' => WPFunctions::get()->__('Ignore field...', 'mailpoet'),
+          'name' => __('Ignore field...', 'mailpoet'),
         ],
         [
           'id' => 'create',
-          'name' => WPFunctions::get()->__('Create new field...', 'mailpoet'),
+          'name' => __('Create new field...', 'mailpoet'),
         ],
       ] :
       [
         [
           'id' => 'select',
-          'name' => WPFunctions::get()->__('Select all...', 'mailpoet'),
+          'name' => __('Select all...', 'mailpoet'),
         ],
         [
           'id' => 'deselect',
-          'name' => WPFunctions::get()->__('Deselect all...', 'mailpoet'),
+          'name' => __('Deselect all...', 'mailpoet'),
         ],
       ];
     $select2Fields = [
       [
-        'name' => WPFunctions::get()->__('Actions', 'mailpoet'),
+        'name' => __('Actions', 'mailpoet'),
         'children' => $actions,
       ],
       [
-        'name' => WPFunctions::get()->__('System fields', 'mailpoet'),
+        'name' => __('System fields', 'mailpoet'),
         'children' => $this->formatSubscriberFields($subscriberFields),
       ],
     ];
     if ($subscriberCustomFields) {
       array_push($select2Fields, [
-        'name' => WPFunctions::get()->__('User fields', 'mailpoet'),
+        'name' => __('User fields', 'mailpoet'),
         'children' => $this->formatSubscriberCustomFields(
           $subscriberCustomFields
         ),