Remove usage constant from the old model

[MAILPOET-4338]

mailpoet/lib/API/JSON/v1/Subscribers.php

@@ -12,7 +12,6 @@ use MailPoet\Entities\SegmentEntity;
 use MailPoet\Entities\SubscriberEntity;
 use MailPoet\Exception;
 use MailPoet\Listing;
-use MailPoet\Models\Subscriber;
 use MailPoet\Segments\SegmentsRepository;
 use MailPoet\Settings\SettingsController;
 use MailPoet\Subscribers\ConfirmationEmailMailer;
@@ -114,7 +113,7 @@ class Subscribers extends APIEndpoint {
   private function preferUnsubscribedStatusFromSegment(array $subscriber, $segmentId) {
     $segmentStatus = $this->findSegmentStatus($subscriber, $segmentId);
 
-    if ($segmentStatus === Subscriber::STATUS_UNSUBSCRIBED) {
+    if ($segmentStatus === SubscriberEntity::STATUS_UNSUBSCRIBED) {
       $subscriber['status'] = $segmentStatus;
     }
     return $subscriber;

mailpoet/lib/Config/Migrator.php

@@ -5,8 +5,8 @@ namespace MailPoet\Config;
 use MailPoet\Cron\CronTrigger;
 use MailPoet\Entities\DynamicSegmentFilterData;
 use MailPoet\Entities\FormEntity;
-use MailPoet\Models\Newsletter;
+use MailPoet\Entities\NewsletterEntity;
-use MailPoet\Models\Subscriber;
+use MailPoet\Entities\SubscriberEntity;
 use MailPoet\Segments\DynamicSegments\Filters\EmailAction;
 use MailPoet\Segments\DynamicSegments\Filters\UserRole;
 use MailPoet\Segments\DynamicSegments\Filters\WooCommerceCategory;
@@ -242,7 +242,7 @@ class Migrator {
       'first_name varchar(255) NOT NULL DEFAULT "",',
       'last_name varchar(255) NOT NULL DEFAULT "",',
       'email varchar(150) NOT NULL,',
-      'status varchar(12) NOT NULL DEFAULT "' . Subscriber::STATUS_UNCONFIRMED . '",',
+      'status varchar(12) NOT NULL DEFAULT "' . SubscriberEntity::STATUS_UNCONFIRMED . '",',
       'subscribed_ip varchar(45) NULL,',
       'confirmed_ip varchar(45) NULL,',
       'confirmed_at timestamp NULL,',
@@ -278,7 +278,7 @@ class Migrator {
       'id int(11) unsigned NOT NULL AUTO_INCREMENT,',
       'subscriber_id int(11) unsigned NOT NULL,',
       'segment_id int(11) unsigned NOT NULL,',
-      'status varchar(12) NOT NULL DEFAULT "' . Subscriber::STATUS_SUBSCRIBED . '",',
+      'status varchar(12) NOT NULL DEFAULT "' . SubscriberEntity::STATUS_SUBSCRIBED . '",',
       'created_at timestamp NULL,', // must be NULL, see comment at the top
       'updated_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
       'PRIMARY KEY  (id),',
@@ -321,7 +321,7 @@ class Migrator {
       'type varchar(20) NOT NULL DEFAULT "standard",',
       'sender_address varchar(150) NOT NULL DEFAULT "",',
       'sender_name varchar(150) NOT NULL DEFAULT "",',
-      'status varchar(20) NOT NULL DEFAULT "' . Newsletter::STATUS_DRAFT . '",',
+      'status varchar(20) NOT NULL DEFAULT "' . NewsletterEntity::STATUS_DRAFT . '",',
       'reply_to_address varchar(150) NOT NULL DEFAULT "",',
       'reply_to_name varchar(150) NOT NULL DEFAULT "",',
       'preheader varchar(250) NOT NULL DEFAULT "",',

mailpoet/lib/Cron/Workers/StatsNotifications/Worker.php

@@ -12,7 +12,6 @@ use MailPoet\Entities\SendingQueueEntity;
 use MailPoet\Entities\StatsNotificationEntity;
 use MailPoet\Mailer\MailerFactory;
 use MailPoet\Mailer\MetaInfo;
-use MailPoet\Models\ScheduledTask;
 use MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository;
 use MailPoet\Settings\SettingsController;
 use MailPoet\Subscribers\SubscribersRepository;
@@ -180,7 +179,7 @@ class Worker {
   }
 
   private function markTaskAsFinished(ScheduledTaskEntity $task) {
-    $task->setStatus(ScheduledTask::STATUS_COMPLETED);
+    $task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
     $task->setProcessedAt(new Carbon);
     $task->setScheduledAt(null);
     $this->entityManager->flush();

mailpoet/lib/CustomFields/ApiDataSanitizer.php

@@ -3,7 +3,7 @@
 namespace MailPoet\CustomFields;
 
 use InvalidArgumentException;
-use MailPoet\Models\CustomField;
+use MailPoet\Entities\CustomFieldEntity;
 
 class ApiDataSanitizer {
 
@@ -69,19 +69,19 @@ class ApiDataSanitizer {
 
   private function getExtraParams($data) {
     $type = strtolower($data['type']);
-    if (in_array($type, [CustomField::TYPE_TEXT, CustomField::TYPE_TEXTAREA], true)) {
+    if (in_array($type, [CustomFieldEntity::TYPE_TEXT, CustomFieldEntity::TYPE_TEXTAREA], true)) {
       return $this->getExtraParamsForText($data['params']);
     }
 
-    if (in_array($type, [CustomField::TYPE_RADIO, CustomField::TYPE_SELECT], true)) {
+    if (in_array($type, [CustomFieldEntity::TYPE_RADIO, CustomFieldEntity::TYPE_SELECT], true)) {
       return $this->getExtraParamsForSelect($data['params']);
     }
 
-    if ($type === CustomField::TYPE_CHECKBOX) {
+    if ($type === CustomFieldEntity::TYPE_CHECKBOX) {
       return $this->getExtraParamsForCheckbox($data['params']);
     }
 
-    if ($type === CustomField::TYPE_DATE) {
+    if ($type === CustomFieldEntity::TYPE_DATE) {
       return $this->getExtraParamsForDate($data['params']);
     }
 

mailpoet/lib/Newsletter/Scheduler/PostNotificationScheduler.php

@@ -5,8 +5,8 @@ namespace MailPoet\Newsletter\Scheduler;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\NewsletterOptionEntity;
 use MailPoet\Entities\NewsletterOptionFieldEntity;
+use MailPoet\Entities\SendingQueueEntity;
 use MailPoet\Logging\LoggerFactory;
-use MailPoet\Models\SendingQueue;
 use MailPoet\Newsletter\NewsletterPostsRepository;
 use MailPoet\Newsletter\NewslettersRepository;
 use MailPoet\Newsletter\Options\NewsletterOptionFieldsRepository;
@@ -120,7 +120,7 @@ class PostNotificationScheduler {
 
     $sendingTask = SendingTask::create();
     $sendingTask->newsletterId = $newsletter->getId();
-    $sendingTask->status = SendingQueue::STATUS_SCHEDULED;
+    $sendingTask->status = SendingQueueEntity::STATUS_SCHEDULED;
     $sendingTask->scheduledAt = $nextRunDate;
     $sendingTask->save();
     $this->loggerFactory->getLogger(LoggerFactory::TOPIC_POST_NOTIFICATIONS)->info(

mailpoet/lib/Newsletter/Scheduler/WelcomeScheduler.php

@@ -5,8 +5,8 @@ namespace MailPoet\Newsletter\Scheduler;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\NewsletterOptionFieldEntity;
 use MailPoet\Entities\SegmentEntity;
+use MailPoet\Entities\SendingQueueEntity;
 use MailPoet\Entities\SubscriberEntity;
-use MailPoet\Models\SendingQueue;
 use MailPoet\Newsletter\NewslettersRepository;
 use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
 use MailPoet\Segments\SegmentsRepository;
@@ -120,8 +120,8 @@ class WelcomeScheduler {
     $sendingTask = SendingTask::create();
     $sendingTask->newsletterId = $newsletter->getId();
     $sendingTask->setSubscribers([$subscriberId]);
-    $sendingTask->status = SendingQueue::STATUS_SCHEDULED;
+    $sendingTask->status = SendingQueueEntity::STATUS_SCHEDULED;
-    $sendingTask->priority = SendingQueue::PRIORITY_HIGH;
+    $sendingTask->priority = SendingQueueEntity::PRIORITY_HIGH;
     $sendingTask->scheduledAt = $this->scheduler->getScheduledTimeWithDelay(
       $newsletter->getOptionValue(NewsletterOptionFieldEntity::NAME_AFTER_TIME_TYPE),
       $newsletter->getOptionValue(NewsletterOptionFieldEntity::NAME_AFTER_TIME_NUMBER)

mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php

@@ -7,7 +7,6 @@ use MailPoet\Entities\ScheduledTaskEntity;
 use MailPoet\Entities\ScheduledTaskSubscriberEntity;
 use MailPoet\Entities\SendingQueueEntity;
 use MailPoet\Entities\SubscriberEntity;
-use MailPoet\Models\ScheduledTask;
 use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
 use MailPoet\Subscribers\SubscribersRepository;
 use MailPoet\Tasks\Sending;
@@ -124,7 +123,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
 
     // create previous completed task
     $previousEmailCountsTask = $this->createRunningTask();
-    $previousEmailCountsTask->setStatus(ScheduledTask::STATUS_COMPLETED);
+    $previousEmailCountsTask->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
     $previousEmailCountsTask->setCreatedAt(Carbon::now()->subDays(2));
     $previousEmailCountsTask->setScheduledAt(Carbon::now()->subDays(1));
     $previousEmailCountsTask->setUpdatedAt(Carbon::now()->subDays(1));

mailpoet/tests/integration/Newsletter/Listing/NewsletterListingRepositoryTest.php

@@ -8,7 +8,6 @@ use MailPoet\Entities\NewsletterOptionFieldEntity;
 use MailPoet\Entities\NewsletterSegmentEntity;
 use MailPoet\Entities\SegmentEntity;
 use MailPoet\Listing\Handler;
-use MailPoet\Models\Newsletter;
 
 class NewsletterListingRepositoryTest extends \MailPoetTest {
   public function testItAppliesGroup() {
@@ -161,7 +160,7 @@ class NewsletterListingRepositoryTest extends \MailPoetTest {
     // get 'woocommerce' group
     $newsletters = $newsletterListingRepository->getData($listingHandler->getListingDefinition([
       'params' => [
-        'type' => Newsletter::TYPE_AUTOMATIC,
+        'type' => NewsletterEntity::TYPE_AUTOMATIC,
         'group' => 'woocommerce',
       ],
     ]));
@@ -170,14 +169,14 @@ class NewsletterListingRepositoryTest extends \MailPoetTest {
     // get 'unicorns' group
     $newsletters = $newsletterListingRepository->getData($listingHandler->getListingDefinition([
       'params' => [
-        'type' => Newsletter::TYPE_AUTOMATIC,
+        'type' => NewsletterEntity::TYPE_AUTOMATIC,
         'group' => 'unicorns',
       ],
     ]));
     expect($newsletters)->count(1);
 
     // get all emails group
-    $newsletters = $newsletterListingRepository->getData($listingHandler->getListingDefinition(['type' => Newsletter::TYPE_AUTOMATIC]));
+    $newsletters = $newsletterListingRepository->getData($listingHandler->getListingDefinition(['type' => NewsletterEntity::TYPE_AUTOMATIC]));
     expect($newsletters)->count(2);
   }
 

mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php

@@ -19,7 +19,6 @@ use MailPoet\Entities\StatisticsOpenEntity;
 use MailPoet\Entities\StatisticsWooCommercePurchaseEntity;
 use MailPoet\Entities\StatsNotificationEntity;
 use MailPoet\Entities\SubscriberEntity;
-use MailPoet\Models\Newsletter;
 use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersRepository;
 use MailPoet\Tasks\Sending as SendingTask;
 use MailPoetVendor\Carbon\Carbon;
@@ -240,13 +239,13 @@ class NewsletterRepositoryTest extends \MailPoetTest {
 
   public function testItGetsAllArchiveNewsletters() {
     $types = [
-      Newsletter::TYPE_STANDARD,
+      NewsletterEntity::TYPE_STANDARD,
-      Newsletter::TYPE_STANDARD, // should be returned
+      NewsletterEntity::TYPE_STANDARD, // should be returned
-      Newsletter::TYPE_WELCOME,
+      NewsletterEntity::TYPE_WELCOME,
-      Newsletter::TYPE_AUTOMATIC,
+      NewsletterEntity::TYPE_AUTOMATIC,
-      Newsletter::TYPE_NOTIFICATION,
+      NewsletterEntity::TYPE_NOTIFICATION,
-      Newsletter::TYPE_NOTIFICATION_HISTORY, // should be returned
+      NewsletterEntity::TYPE_NOTIFICATION_HISTORY, // should be returned
-      Newsletter::TYPE_NOTIFICATION_HISTORY,
+      NewsletterEntity::TYPE_NOTIFICATION_HISTORY,
     ];
 
     list($newsletters, $sendingQueues) = $this->createNewslettersAndSendingTasks($types);

mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php

@@ -8,7 +8,6 @@ use MailPoet\Entities\SegmentEntity;
 use MailPoet\Entities\SubscriberCustomFieldEntity;
 use MailPoet\Entities\SubscriberEntity;
 use MailPoet\Entities\SubscriberSegmentEntity;
-use MailPoet\Models\CustomField;
 use MailPoet\Segments\SegmentsRepository;
 
 class SubscribersRepositoryTest extends \MailPoetTest {
@@ -328,7 +327,7 @@ class SubscribersRepositoryTest extends \MailPoetTest {
   private function createCustomField(string $name): CustomFieldEntity {
     $customField = new CustomFieldEntity();
     $customField->setName($name);
-    $customField->setType(CustomField::TYPE_TEXT);
+    $customField->setType(CustomFieldEntity::TYPE_TEXT);
     $this->entityManager->persist($customField);
     $this->entityManager->flush();
     return $customField;

mailpoet/tests/integration/Util/Notices/InactiveSubscribersNoticeTest.php

@@ -2,13 +2,12 @@
 
 namespace MailPoet\Util\Notices;
 
-use MailPoet\Models\Subscriber;
+use MailPoet\Entities\SubscriberEntity;
 use MailPoet\Settings\SettingsController;
 use MailPoet\Settings\SettingsRepository;
 use MailPoet\Test\DataFactories\Settings;
 use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Idiorm\ORM;
 
 class InactiveSubscribersNoticeTest extends \MailPoetTest {
   public function testItDisplays() {
@@ -74,13 +73,13 @@ class InactiveSubscribersNoticeTest extends \MailPoetTest {
 
   private function cleanup() {
     $this->diContainer->get(SettingsRepository::class)->truncate();
-    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    $this->truncateEntity(SubscriberEntity::class);
   }
 
   private function createSubscribers($count) {
     for ($i = 0; $i < $count; $i++) {
       $subscriberFactory = new SubscriberFactory();
-      $subscriberFactory->withStatus(Subscriber::STATUS_INACTIVE);
+      $subscriberFactory->withStatus(SubscriberEntity::STATUS_INACTIVE);
       $subscriberFactory->create();
     }
   }

mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php

@@ -6,7 +6,6 @@ use Codeception\Stub;
 use MailPoet\DI\ContainerWrapper;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\SettingEntity;
-use MailPoet\Models\Newsletter;
 use MailPoet\Newsletter\NewslettersRepository;
 use MailPoet\Settings\SettingsController;
 use MailPoet\WooCommerce\Helper as WooCommerceHelper;
@@ -58,7 +57,7 @@ class TransactionalEmailsTest extends \MailPoetTest {
 
   public function testInitCreatesTransactionalEmailAndSavesItsId() {
     $this->transactionalEmails->init();
-    $email = $this->newslettersRepository->findOneBy(['type' => Newsletter::TYPE_WC_TRANSACTIONAL_EMAIL]);
+    $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]);
     assert($email instanceof NewsletterEntity);
     $id = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID, null);
     expect($email)->notEmpty();
@@ -69,7 +68,7 @@ class TransactionalEmailsTest extends \MailPoetTest {
   public function testInitDoesntCreateTransactionalEmailIfSettingAlreadySet() {
     $this->settings->set(TransactionalEmails::SETTING_EMAIL_ID, 1);
     $this->transactionalEmails->init();
-    $email = $this->newslettersRepository->findOneBy(['type' => Newsletter::TYPE_WC_TRANSACTIONAL_EMAIL]);
+    $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]);
     expect($email)->equals(null);
   }
 
@@ -99,7 +98,7 @@ class TransactionalEmailsTest extends \MailPoetTest {
     $optionOriginalValue = $this->wp->getOption('woocommerce_email_footer_text');
     $this->wp->updateOption('woocommerce_email_footer_text', '<div><p>Text <a href="http://example.com">Link</a></p></div>');
     $this->transactionalEmails->init();
-    $email = $this->newslettersRepository->findOneBy(['type' => Newsletter::TYPE_WC_TRANSACTIONAL_EMAIL]);
+    $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]);
     assert($email instanceof NewsletterEntity);
     $body = $email->getBody();
     assert(is_array($body));

mailpoet/tests/unit/Form/Block/SelectTest.php

@@ -2,11 +2,11 @@
 
 namespace MailPoet\Test\Form\Block;
 
+use MailPoet\Entities\SubscriberEntity;
 use MailPoet\Form\Block\BlockRendererHelper;
 use MailPoet\Form\Block\Select;
 use MailPoet\Form\BlockStylesRenderer;
 use MailPoet\Form\BlockWrapperRenderer;
-use MailPoet\Models\Subscriber;
 use MailPoet\WP\Functions;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -52,19 +52,19 @@ class SelectTest extends \MailPoetUnitTest {
         'values' => [
           [
             'value' => [
-              Subscriber::STATUS_SUBSCRIBED => Subscriber::STATUS_SUBSCRIBED,
+              SubscriberEntity::STATUS_SUBSCRIBED => SubscriberEntity::STATUS_SUBSCRIBED,
             ],
             'is_checked' => false,
           ],
           [
             'value' => [
-              Subscriber::STATUS_UNSUBSCRIBED => Subscriber::STATUS_UNSUBSCRIBED,
+              SubscriberEntity::STATUS_UNSUBSCRIBED => SubscriberEntity::STATUS_UNSUBSCRIBED,
             ],
             'is_checked' => false,
           ],
           [
             'value' => [
-              Subscriber::STATUS_BOUNCED => Subscriber::STATUS_BOUNCED,
+              SubscriberEntity::STATUS_BOUNCED => SubscriberEntity::STATUS_BOUNCED,
             ],
             'is_checked' => false,
             'is_disabled' => false,
@@ -77,9 +77,9 @@ class SelectTest extends \MailPoetUnitTest {
 
   public function testItRendersSelectBlock() {
     $rendered = $this->selectBlock->render($this->block, []);
-    expect($rendered)->stringContainsString(Subscriber::STATUS_SUBSCRIBED);
+    expect($rendered)->stringContainsString(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($rendered)->stringContainsString(Subscriber::STATUS_UNSUBSCRIBED);
+    expect($rendered)->stringContainsString(SubscriberEntity::STATUS_UNSUBSCRIBED);
-    expect($rendered)->stringContainsString(Subscriber::STATUS_BOUNCED);
+    expect($rendered)->stringContainsString(SubscriberEntity::STATUS_BOUNCED);
   }
 
   public function testItRendersSelectedOption() {
@@ -97,6 +97,6 @@ class SelectTest extends \MailPoetUnitTest {
   public function testItDoesNotRenderHiddenOptions() {
     $this->block['params']['values'][2]['is_hidden'] = true;
     $rendered = $this->selectBlock->render($this->block, []);
-    expect($rendered)->stringNotContainsString(Subscriber::STATUS_BOUNCED);
+    expect($rendered)->stringNotContainsString(SubscriberEntity::STATUS_BOUNCED);
   }
 }