diff --git a/mailpoet/lib/Automation/Engine/Control/RootStep.php b/mailpoet/lib/Automation/Engine/Control/RootStep.php index cff0af4bd3..5255f741ba 100644 --- a/mailpoet/lib/Automation/Engine/Control/RootStep.php +++ b/mailpoet/lib/Automation/Engine/Control/RootStep.php @@ -2,7 +2,7 @@ namespace MailPoet\Automation\Engine\Control; -use MailPoet\Automation\Engine\Workflows\Step; +use MailPoet\Automation\Engine\Integration\Step; use MailPoet\Validator\Schema\ObjectSchema; class RootStep implements Step { diff --git a/mailpoet/lib/Automation/Engine/Control/StepHandler.php b/mailpoet/lib/Automation/Engine/Control/StepHandler.php index be58a167de..fe3ec12b00 100644 --- a/mailpoet/lib/Automation/Engine/Control/StepHandler.php +++ b/mailpoet/lib/Automation/Engine/Control/StepHandler.php @@ -12,13 +12,13 @@ use MailPoet\Automation\Engine\Data\WorkflowRunLog; use MailPoet\Automation\Engine\Exceptions; use MailPoet\Automation\Engine\Exceptions\InvalidStateException; use MailPoet\Automation\Engine\Hooks; +use MailPoet\Automation\Engine\Integration\Action; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; use MailPoet\Automation\Engine\Storage\WorkflowRunLogStorage; use MailPoet\Automation\Engine\Storage\WorkflowRunStorage; use MailPoet\Automation\Engine\Storage\WorkflowStorage; use MailPoet\Automation\Engine\WordPress; -use MailPoet\Automation\Engine\Workflows\Action; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; use Throwable; class StepHandler { diff --git a/mailpoet/lib/Automation/Engine/Control/SubjectLoader.php b/mailpoet/lib/Automation/Engine/Control/SubjectLoader.php index 623294d547..ae2dd2801f 100644 --- a/mailpoet/lib/Automation/Engine/Control/SubjectLoader.php +++ b/mailpoet/lib/Automation/Engine/Control/SubjectLoader.php @@ -5,9 +5,9 @@ namespace MailPoet\Automation\Engine\Control; use MailPoet\Automation\Engine\Data\Subject as SubjectData; use MailPoet\Automation\Engine\Data\SubjectEntry; use MailPoet\Automation\Engine\Exceptions; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; use MailPoet\Automation\Engine\Registry; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; class SubjectLoader { /** @var Registry */ diff --git a/mailpoet/lib/Automation/Engine/Control/TriggerHandler.php b/mailpoet/lib/Automation/Engine/Control/TriggerHandler.php index d0974c91d2..433acd8766 100644 --- a/mailpoet/lib/Automation/Engine/Control/TriggerHandler.php +++ b/mailpoet/lib/Automation/Engine/Control/TriggerHandler.php @@ -7,10 +7,10 @@ use MailPoet\Automation\Engine\Data\Subject; use MailPoet\Automation\Engine\Data\WorkflowRun; use MailPoet\Automation\Engine\Exceptions; use MailPoet\Automation\Engine\Hooks; +use MailPoet\Automation\Engine\Integration\Trigger; use MailPoet\Automation\Engine\Storage\WorkflowRunStorage; use MailPoet\Automation\Engine\Storage\WorkflowStorage; use MailPoet\Automation\Engine\WordPress; -use MailPoet\Automation\Engine\Workflows\Trigger; class TriggerHandler { /** @var ActionScheduler */ diff --git a/mailpoet/lib/Automation/Engine/Data/StepRunArgs.php b/mailpoet/lib/Automation/Engine/Data/StepRunArgs.php index 40fcc92c1d..55d09007aa 100644 --- a/mailpoet/lib/Automation/Engine/Data/StepRunArgs.php +++ b/mailpoet/lib/Automation/Engine/Data/StepRunArgs.php @@ -4,8 +4,8 @@ namespace MailPoet\Automation\Engine\Data; use MailPoet\Automation\Engine\Exceptions; use MailPoet\Automation\Engine\Exceptions\InvalidStateException; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; class StepRunArgs { /** @var Workflow */ diff --git a/mailpoet/lib/Automation/Engine/Data/SubjectEntry.php b/mailpoet/lib/Automation/Engine/Data/SubjectEntry.php index 1d4ab4be1f..e7520fcf47 100644 --- a/mailpoet/lib/Automation/Engine/Data/SubjectEntry.php +++ b/mailpoet/lib/Automation/Engine/Data/SubjectEntry.php @@ -4,8 +4,8 @@ namespace MailPoet\Automation\Engine\Data; use MailPoet\Automation\Engine\Data\Subject as SubjectData; use MailPoet\Automation\Engine\Exceptions; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; use Throwable; /** diff --git a/mailpoet/lib/Automation/Engine/Workflows/Action.php b/mailpoet/lib/Automation/Engine/Integration/Action.php similarity index 87% rename from mailpoet/lib/Automation/Engine/Workflows/Action.php rename to mailpoet/lib/Automation/Engine/Integration/Action.php index bb1c03df4f..c44df5335e 100644 --- a/mailpoet/lib/Automation/Engine/Workflows/Action.php +++ b/mailpoet/lib/Automation/Engine/Integration/Action.php @@ -1,6 +1,6 @@ */ diff --git a/mailpoet/lib/Automation/Engine/Storage/WorkflowStorage.php b/mailpoet/lib/Automation/Engine/Storage/WorkflowStorage.php index d1ba1467c6..6b439b7683 100644 --- a/mailpoet/lib/Automation/Engine/Storage/WorkflowStorage.php +++ b/mailpoet/lib/Automation/Engine/Storage/WorkflowStorage.php @@ -5,8 +5,8 @@ namespace MailPoet\Automation\Engine\Storage; use DateTimeImmutable; use MailPoet\Automation\Engine\Data\Workflow; use MailPoet\Automation\Engine\Exceptions; +use MailPoet\Automation\Engine\Integration\Trigger; use MailPoet\Automation\Engine\Utils\Json; -use MailPoet\Automation\Engine\Workflows\Trigger; use wpdb; class WorkflowStorage { diff --git a/mailpoet/lib/Automation/Integrations/Core/Actions/DelayAction.php b/mailpoet/lib/Automation/Integrations/Core/Actions/DelayAction.php index befca304a2..0a7c946203 100644 --- a/mailpoet/lib/Automation/Integrations/Core/Actions/DelayAction.php +++ b/mailpoet/lib/Automation/Integrations/Core/Actions/DelayAction.php @@ -7,7 +7,7 @@ use MailPoet\Automation\Engine\Data\Step; use MailPoet\Automation\Engine\Data\StepRunArgs; use MailPoet\Automation\Engine\Data\Workflow; use MailPoet\Automation\Engine\Hooks; -use MailPoet\Automation\Engine\Workflows\Action; +use MailPoet\Automation\Engine\Integration\Action; use MailPoet\Validator\Builder; use MailPoet\Validator\Schema\ObjectSchema; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Actions/SendEmailAction.php b/mailpoet/lib/Automation/Integrations/MailPoet/Actions/SendEmailAction.php index 501c6226ef..1b7227be7d 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Actions/SendEmailAction.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Actions/SendEmailAction.php @@ -5,8 +5,8 @@ namespace MailPoet\Automation\Integrations\MailPoet\Actions; use MailPoet\Automation\Engine\Data\Step; use MailPoet\Automation\Engine\Data\StepRunArgs; use MailPoet\Automation\Engine\Data\Workflow; -use MailPoet\Automation\Engine\Workflows\Action; -use MailPoet\Automation\Engine\Workflows\Subject; +use MailPoet\Automation\Engine\Integration\Action; +use MailPoet\Automation\Engine\Integration\Subject; use MailPoet\Automation\Integrations\MailPoet\Payloads\SegmentPayload; use MailPoet\Automation\Integrations\MailPoet\Payloads\SubscriberPayload; use MailPoet\Automation\Integrations\MailPoet\Subjects\SegmentSubject; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SegmentPayload.php b/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SegmentPayload.php index 87e381ca57..8f7432eb8d 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SegmentPayload.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SegmentPayload.php @@ -2,7 +2,7 @@ namespace MailPoet\Automation\Integrations\MailPoet\Payloads; -use MailPoet\Automation\Engine\Workflows\Payload; +use MailPoet\Automation\Engine\Integration\Payload; use MailPoet\Entities\SegmentEntity; use MailPoet\InvalidStateException; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SubscriberPayload.php b/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SubscriberPayload.php index 065fbac5f0..7bd553e42a 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SubscriberPayload.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Payloads/SubscriberPayload.php @@ -2,7 +2,7 @@ namespace MailPoet\Automation\Integrations\MailPoet\Payloads; -use MailPoet\Automation\Engine\Workflows\Payload; +use MailPoet\Automation\Engine\Integration\Payload; use MailPoet\Entities\SubscriberEntity; use MailPoet\InvalidStateException; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SegmentSubject.php b/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SegmentSubject.php index 1d0848c977..86e5d0ba90 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SegmentSubject.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SegmentSubject.php @@ -4,8 +4,8 @@ namespace MailPoet\Automation\Integrations\MailPoet\Subjects; use MailPoet\Automation\Engine\Data\Field; use MailPoet\Automation\Engine\Data\Subject as SubjectData; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; use MailPoet\Automation\Integrations\MailPoet\Payloads\SegmentPayload; use MailPoet\NotFoundException; use MailPoet\Segments\SegmentsRepository; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SubscriberSubject.php b/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SubscriberSubject.php index 7f75a376c2..6753a4647b 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SubscriberSubject.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Subjects/SubscriberSubject.php @@ -4,8 +4,8 @@ namespace MailPoet\Automation\Integrations\MailPoet\Subjects; use MailPoet\Automation\Engine\Data\Field; use MailPoet\Automation\Engine\Data\Subject as SubjectData; -use MailPoet\Automation\Engine\Workflows\Payload; -use MailPoet\Automation\Engine\Workflows\Subject; +use MailPoet\Automation\Engine\Integration\Payload; +use MailPoet\Automation\Engine\Integration\Subject; use MailPoet\Automation\Integrations\MailPoet\Payloads\SubscriberPayload; use MailPoet\Entities\SubscriberEntity; use MailPoet\NotFoundException; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Templates/WorkflowBuilder.php b/mailpoet/lib/Automation/Integrations/MailPoet/Templates/WorkflowBuilder.php index ab0c717196..8c813b40b4 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Templates/WorkflowBuilder.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Templates/WorkflowBuilder.php @@ -5,8 +5,8 @@ namespace MailPoet\Automation\Integrations\MailPoet\Templates; use MailPoet\Automation\Engine\Data\NextStep; use MailPoet\Automation\Engine\Data\Step; use MailPoet\Automation\Engine\Data\Workflow; +use MailPoet\Automation\Engine\Integration\Trigger; use MailPoet\Automation\Engine\Registry; -use MailPoet\Automation\Engine\Workflows\Trigger; use MailPoet\Util\Security; use MailPoet\Validator\Schema\ObjectSchema; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/SomeoneSubscribesTrigger.php b/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/SomeoneSubscribesTrigger.php index ab522d7979..5681a5e04e 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/SomeoneSubscribesTrigger.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/SomeoneSubscribesTrigger.php @@ -5,7 +5,7 @@ namespace MailPoet\Automation\Integrations\MailPoet\Triggers; use MailPoet\Automation\Engine\Data\StepRunArgs; use MailPoet\Automation\Engine\Data\Subject; use MailPoet\Automation\Engine\Hooks; -use MailPoet\Automation\Engine\Workflows\Trigger; +use MailPoet\Automation\Engine\Integration\Trigger; use MailPoet\Automation\Integrations\MailPoet\Payloads\SegmentPayload; use MailPoet\Automation\Integrations\MailPoet\Subjects\SegmentSubject; use MailPoet\Automation\Integrations\MailPoet\Subjects\SubscriberSubject; diff --git a/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/UserRegistrationTrigger.php b/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/UserRegistrationTrigger.php index 4dfa5c6353..a286e68e80 100644 --- a/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/UserRegistrationTrigger.php +++ b/mailpoet/lib/Automation/Integrations/MailPoet/Triggers/UserRegistrationTrigger.php @@ -5,7 +5,7 @@ namespace MailPoet\Automation\Integrations\MailPoet\Triggers; use MailPoet\Automation\Engine\Data\StepRunArgs; use MailPoet\Automation\Engine\Data\Subject; use MailPoet\Automation\Engine\Hooks; -use MailPoet\Automation\Engine\Workflows\Trigger; +use MailPoet\Automation\Engine\Integration\Trigger; use MailPoet\Automation\Integrations\MailPoet\Payloads\SegmentPayload; use MailPoet\Automation\Integrations\MailPoet\Payloads\SubscriberPayload; use MailPoet\Automation\Integrations\MailPoet\Subjects\SegmentSubject; diff --git a/mailpoet/tests/integration/Automation/Engine/Data/WorkflowRunLogTest.php b/mailpoet/tests/integration/Automation/Engine/Data/WorkflowRunLogTest.php index 002c192f4e..e7afec48f3 100644 --- a/mailpoet/tests/integration/Automation/Engine/Data/WorkflowRunLogTest.php +++ b/mailpoet/tests/integration/Automation/Engine/Data/WorkflowRunLogTest.php @@ -13,7 +13,7 @@ use MailPoet\Automation\Engine\Registry; use MailPoet\Automation\Engine\Storage\WorkflowRunLogStorage; use MailPoet\Automation\Engine\Storage\WorkflowRunStorage; use MailPoet\Automation\Engine\Storage\WorkflowStorage; -use MailPoet\Automation\Engine\Workflows\Action; +use MailPoet\Automation\Engine\Integration\Action; use MailPoet\Util\Security; use MailPoet\Validator\Builder; use MailPoet\Validator\Schema\ObjectSchema;