Always count WP user list towards the limit

[MAILPOET-3143]

lib/Subscribers/SubscribersRepository.php

@@ -37,24 +37,6 @@ class SubscribersRepository extends Repository {
     return (int)$query->getSingleScalarResult();
   }
 
-  /**
-   * @return int
-   */
-  public function getTotalSubscribersWithoutWPUsers() {
-    $query = $this->entityManager
-      ->createQueryBuilder()
-      ->select('count(n.id)')
-      ->from(SubscriberEntity::class, 'n')
-      ->where('n.deletedAt IS NULL AND n.status IN (:statuses) AND n.wpUserId IS NULL')
-      ->setParameter('statuses', [
-        SubscriberEntity::STATUS_SUBSCRIBED,
-        SubscriberEntity::STATUS_UNCONFIRMED,
-        SubscriberEntity::STATUS_INACTIVE,
-      ])
-      ->getQuery();
-    return (int)$query->getSingleScalarResult();
-  }
-
   public function findBySegment(int $segmentId): array {
     return $this->entityManager
     ->createQueryBuilder()

lib/Util/License/Features/Subscribers.php

@@ -35,9 +35,6 @@ class Subscribers {
   }
 
   public function getSubscribersCount() {
-    if ($this->hasPremiumSupport()) {
-      return $this->subscribersRepository->getTotalSubscribersWithoutWPUsers();
-    }
     return $this->subscribersRepository->getTotalSubscribers();
   }
 

tests/unit/Util/License/Features/SubscribersTest.php

@@ -152,7 +152,7 @@ class SubscribersTest extends \MailPoetUnitTest {
     expect($subscribersFeature->check())->false();
   }
 
-  public function testCheckReturnsFalseIfPremiumPremiumSupportAndReachedLimit() {
+  public function testCheckReturnsTrueIfPremiumSupportAndReachedLimit() {
     $subscribersFeature = $this->constructWith([
       'has_mss_key' => false,
       'mss_key_state' => 'valid',
@@ -163,9 +163,8 @@ class SubscribersTest extends \MailPoetUnitTest {
       'premium_subscribers_limit' => 2500,
       'mss_subscribers_limit' => 500,
       'support_tier' => 'premium',
-      'subscribers_count_without_wp_users' => 10,
     ]);
-    expect($subscribersFeature->check())->false();
+    expect($subscribersFeature->check())->true();
   }
 
   private function constructWith($specs) {
@@ -183,9 +182,6 @@ class SubscribersTest extends \MailPoetUnitTest {
       'getTotalSubscribers' => function() use($specs) {
         return $specs['subscribers_count'];
       },
-      'getTotalSubscribersWithoutWPUsers' => function() use($specs) {
-        return $specs['subscribers_count_without_wp_users'];
-      },
     ]);
 
     return new SubscribersFeature($settings, $subscribersRepository);