diff --git a/lib/AdminPages/Pages/Newsletters.php b/lib/AdminPages/Pages/Newsletters.php index 615aabf67c..bdfac5167d 100644 --- a/lib/AdminPages/Pages/Newsletters.php +++ b/lib/AdminPages/Pages/Newsletters.php @@ -107,7 +107,6 @@ 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"]); }); diff --git a/lib/AdminPages/Pages/Subscribers.php b/lib/AdminPages/Pages/Subscribers.php index e70933f94b..0407e1bcc9 100644 --- a/lib/AdminPages/Pages/Subscribers.php +++ b/lib/AdminPages/Pages/Subscribers.php @@ -62,7 +62,6 @@ 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"]); }); diff --git a/lib/Subscribers/ImportExport/ImportExportFactory.php b/lib/Subscribers/ImportExport/ImportExportFactory.php index 04782cd01c..4056a8b658 100644 --- a/lib/Subscribers/ImportExport/ImportExportFactory.php +++ b/lib/Subscribers/ImportExport/ImportExportFactory.php @@ -29,7 +29,6 @@ class ImportExportFactory { } 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; })); diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 64bbb1c9ef..c951d6bd72 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -43,6 +43,7 @@ use MailPoet\Subscribers\SubscribersRepository; use MailPoet\Subscription\Captcha; use MailPoet\Subscription\CaptchaSession; use MailPoet\Subscription\SubscriptionUrlFactory; +use MailPoet\Test\DataFactories\DynamicSegment; use MailPoet\WP\Functions; use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Idiorm\ORM; @@ -323,17 +324,19 @@ class SubscribersTest extends \MailPoetTest { expect($response->data[0]['email'])->equals($this->subscriber2->getEmail()); } - public function testItCanAddSegmentsUsingHooks() { - $addSegment = function() { - return 'segment'; - }; - add_filter('mailpoet_subscribers_listings_filters_segments', $addSegment); + public function testItCanLoadDymanicSegments() { + $dynamicSegmentFactory = new DynamicSegment(); + $dynamicSegment = $dynamicSegmentFactory + ->withName('Dynamic') + ->withUserRoleFilter('master_of_universe') + ->create(); + $dynamicSegment->save(); $response = $this->endpoint->listing([ 'filter' => [ - 'segment' => $this->segment2->getId(), + 'segment' => $dynamicSegment->id, ], ]); - expect($response->meta['filters']['segment'])->equals('segment'); + expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->id, 'label' => 'Dynamic (0)']); } public function testItCanSearchListing() {