From 2d3fb6dcffc89fb59210402bdd4b3ce32d6e99b0 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruozzi Date: Mon, 7 Aug 2023 11:40:22 +0200 Subject: [PATCH 1/2] Rename namespace for app tests --- composer.json | 2 +- spec/Enqueuer/ConnectionEnqueuerSpec.php | 2 +- spec/Enqueuer/ContactEnqueuerSpec.php | 2 +- spec/Enqueuer/EcommerceCustomerEnqueuerSpec.php | 4 ++-- spec/Enqueuer/EcommerceOrderEnqueuerSpec.php | 4 ++-- spec/Enqueuer/WebhookEnqueuerSpec.php | 2 +- spec/Mapper/EcommerceCustomerMapperSpec.php | 2 +- spec/Mapper/EcommerceOrderMapperSpec.php | 4 ++-- .../Connection/ConnectionCreateHandlerSpec.php | 2 +- .../Connection/ConnectionUpdateHandlerSpec.php | 2 +- .../Contact/ContactCreateHandlerSpec.php | 2 +- .../Contact/ContactListsSubscriberHandlerSpec.php | 4 ++-- .../Contact/ContactListsUpdaterHandlerSpec.php | 4 ++-- .../Contact/ContactTagsAdderHandlerSpec.php | 2 +- .../Contact/ContactUpdateHandlerSpec.php | 2 +- .../EcommerceCustomerCreateHandlerSpec.php | 4 ++-- .../EcommerceCustomerUpdateHandlerSpec.php | 4 ++-- .../EcommerceOrderCreateHandlerSpec.php | 2 +- .../EcommerceOrderUpdateHandlerSpec.php | 2 +- .../Webhook/WebhookCreateHandlerSpec.php | 2 +- ...stomerBasedListSubscriptionStatusResolverSpec.php | 4 ++-- ...stomerBasedListSubscriptionStatusResolverSpec.php | 4 ++-- ...ustomerBasedListSubscriptionStatusUpdaterSpec.php | 3 +-- ...ustomerBasedListSubscriptionStatusUpdaterSpec.php | 3 +-- tests/Application/config/packages/_sylius.yaml | 12 ++++++------ tests/Application/config/packages/doctrine.yaml | 6 +++--- .../webgriffe_sylius_active_campaign_plugin.yaml | 2 +- .../src/Doctrine/ORM/ChannelRepository.php | 2 +- .../src/Doctrine/ORM/CustomerRepository.php | 2 +- .../Application/src/Doctrine/ORM/OrderRepository.php | 2 +- tests/Application/src/Entity/Channel/Channel.php | 2 +- .../src/Entity/Channel/ChannelInterface.php | 2 +- .../src/Entity/Customer/ChannelCustomer.php | 2 +- tests/Application/src/Entity/Customer/Customer.php | 2 +- .../src/Entity/Customer/CustomerInterface.php | 2 +- tests/Application/src/Entity/Order/Order.php | 2 +- .../Application/src/Entity/Order/OrderInterface.php | 2 +- .../EnqueueConnectionCommandTest/channels.yaml | 2 +- .../channels.yaml | 2 +- .../customers.yaml | 4 ++-- .../customers.yaml | 2 +- .../customers.yaml | 2 +- .../channels.yaml | 2 +- .../customers.yaml | 2 +- .../orders.yaml | 2 +- .../EnqueueEcommerceOrderCommandTest/channels.yaml | 2 +- .../EnqueueEcommerceOrderCommandTest/customers.yaml | 2 +- .../EnqueueEcommerceOrderCommandTest/orders.yaml | 2 +- .../Command/EnqueueWebhookCommandTest/channels.yaml | 2 +- .../customers.yaml | 2 +- .../Controller/WebhookControllerTest/customers.yaml | 2 +- .../ChannelSubscriberTest/channels.yaml | 2 +- .../CustomerSubscriberTest/channels.yaml | 2 +- .../CustomerSubscriberTest/customers.yaml | 4 ++-- .../OrderSubscriberTest/channels.yaml | 2 +- .../OrderSubscriberTest/customers.yaml | 2 +- .../EventSubscriber/OrderSubscriberTest/orders.yaml | 2 +- .../ConnectionCreateHandlerTest/channels.yaml | 2 +- .../ContactCreateHandlerTest/customers.yaml | 2 +- .../EcommerceCustomerCreateHandlerTest/channels.yaml | 2 +- .../customers.yaml | 2 +- .../EcommerceOrderCreateHandlerTest/channels.yaml | 2 +- .../EcommerceOrderCreateHandlerTest/customers.yaml | 4 ++-- .../EcommerceOrderCreateHandlerTest/orders.yaml | 2 +- 64 files changed, 83 insertions(+), 85 deletions(-) diff --git a/composer.json b/composer.json index 2545a17..69032f7 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,7 @@ }, "autoload-dev": { "psr-4": { - "App\\": "tests/Application/src" + "Tests\\Webgriffe\\SyliusActiveCampaignPlugin\\App\\": "tests/Application/src" }, "classmap": [ "tests/Application/Kernel.php" diff --git a/spec/Enqueuer/ConnectionEnqueuerSpec.php b/spec/Enqueuer/ConnectionEnqueuerSpec.php index 805bf71..a6608b0 100644 --- a/spec/Enqueuer/ConnectionEnqueuerSpec.php +++ b/spec/Enqueuer/ConnectionEnqueuerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Enqueuer; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use Doctrine\ORM\EntityManagerInterface; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/spec/Enqueuer/ContactEnqueuerSpec.php b/spec/Enqueuer/ContactEnqueuerSpec.php index 904ac08..73eb1c7 100644 --- a/spec/Enqueuer/ContactEnqueuerSpec.php +++ b/spec/Enqueuer/ContactEnqueuerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Enqueuer; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Doctrine\ORM\EntityManagerInterface; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/spec/Enqueuer/EcommerceCustomerEnqueuerSpec.php b/spec/Enqueuer/EcommerceCustomerEnqueuerSpec.php index 441d312..555f430 100644 --- a/spec/Enqueuer/EcommerceCustomerEnqueuerSpec.php +++ b/spec/Enqueuer/EcommerceCustomerEnqueuerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Enqueuer; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Doctrine\ORM\EntityManagerInterface; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/spec/Enqueuer/EcommerceOrderEnqueuerSpec.php b/spec/Enqueuer/EcommerceOrderEnqueuerSpec.php index 48fa98b..f699e53 100644 --- a/spec/Enqueuer/EcommerceOrderEnqueuerSpec.php +++ b/spec/Enqueuer/EcommerceOrderEnqueuerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Enqueuer; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Order\OrderInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\OrderInterface; use Doctrine\ORM\EntityManagerInterface; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/spec/Enqueuer/WebhookEnqueuerSpec.php b/spec/Enqueuer/WebhookEnqueuerSpec.php index 6e67c29..bfd94a3 100644 --- a/spec/Enqueuer/WebhookEnqueuerSpec.php +++ b/spec/Enqueuer/WebhookEnqueuerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Enqueuer; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use Prophecy\Argument; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\MessageBusInterface; diff --git a/spec/Mapper/EcommerceCustomerMapperSpec.php b/spec/Mapper/EcommerceCustomerMapperSpec.php index 0b14f7b..788687c 100644 --- a/spec/Mapper/EcommerceCustomerMapperSpec.php +++ b/spec/Mapper/EcommerceCustomerMapperSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Mapper; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use PhpSpec\ObjectBehavior; use Sylius\Component\Core\Model\CustomerInterface; use Webgriffe\SyliusActiveCampaignPlugin\Exception\ChannelConnectionNotSetException; diff --git a/spec/Mapper/EcommerceOrderMapperSpec.php b/spec/Mapper/EcommerceOrderMapperSpec.php index bf66a1e..590915c 100644 --- a/spec/Mapper/EcommerceOrderMapperSpec.php +++ b/spec/Mapper/EcommerceOrderMapperSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Mapper; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use DateTime; use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; diff --git a/spec/MessageHandler/Connection/ConnectionCreateHandlerSpec.php b/spec/MessageHandler/Connection/ConnectionCreateHandlerSpec.php index 824bca3..a14ccfd 100644 --- a/spec/MessageHandler/Connection/ConnectionCreateHandlerSpec.php +++ b/spec/MessageHandler/Connection/ConnectionCreateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Connection; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Channel\Repository\ChannelRepositoryInterface; diff --git a/spec/MessageHandler/Connection/ConnectionUpdateHandlerSpec.php b/spec/MessageHandler/Connection/ConnectionUpdateHandlerSpec.php index 1626f11..62e7763 100644 --- a/spec/MessageHandler/Connection/ConnectionUpdateHandlerSpec.php +++ b/spec/MessageHandler/Connection/ConnectionUpdateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Connection; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Channel\Repository\ChannelRepositoryInterface; diff --git a/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php b/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php index 9112278..f6868d4 100644 --- a/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php +++ b/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface; diff --git a/spec/MessageHandler/Contact/ContactListsSubscriberHandlerSpec.php b/spec/MessageHandler/Contact/ContactListsSubscriberHandlerSpec.php index 24f8f3c..598533a 100644 --- a/spec/MessageHandler/Contact/ContactListsSubscriberHandlerSpec.php +++ b/spec/MessageHandler/Contact/ContactListsSubscriberHandlerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use Psr\Log\LoggerInterface; use Sylius\Component\Core\Model\ChannelInterface as SyliusChannelInterface; diff --git a/spec/MessageHandler/Contact/ContactListsUpdaterHandlerSpec.php b/spec/MessageHandler/Contact/ContactListsUpdaterHandlerSpec.php index b1b6db3..caef176 100644 --- a/spec/MessageHandler/Contact/ContactListsUpdaterHandlerSpec.php +++ b/spec/MessageHandler/Contact/ContactListsUpdaterHandlerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use LogicException; use PhpSpec\ObjectBehavior; diff --git a/spec/MessageHandler/Contact/ContactTagsAdderHandlerSpec.php b/spec/MessageHandler/Contact/ContactTagsAdderHandlerSpec.php index 66409e6..ca24c36 100644 --- a/spec/MessageHandler/Contact/ContactTagsAdderHandlerSpec.php +++ b/spec/MessageHandler/Contact/ContactTagsAdderHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use Psr\Log\LoggerInterface; use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface; diff --git a/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php b/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php index 7b84b3b..4a7d74b 100644 --- a/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php +++ b/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface; diff --git a/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerCreateHandlerSpec.php b/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerCreateHandlerSpec.php index a6cdc67..b92783e 100644 --- a/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerCreateHandlerSpec.php +++ b/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerCreateHandlerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceCustomer; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Doctrine\ORM\EntityManagerInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; diff --git a/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerUpdateHandlerSpec.php b/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerUpdateHandlerSpec.php index 2eedaf5..999c580 100644 --- a/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerUpdateHandlerSpec.php +++ b/spec/MessageHandler/EcommerceCustomer/EcommerceCustomerUpdateHandlerSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceCustomer; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Channel\Repository\ChannelRepositoryInterface; diff --git a/spec/MessageHandler/EcommerceOrder/EcommerceOrderCreateHandlerSpec.php b/spec/MessageHandler/EcommerceOrder/EcommerceOrderCreateHandlerSpec.php index 995828d..fb940ef 100644 --- a/spec/MessageHandler/EcommerceOrder/EcommerceOrderCreateHandlerSpec.php +++ b/spec/MessageHandler/EcommerceOrder/EcommerceOrderCreateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceOrder; -use App\Entity\Order\OrderInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\OrderInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Core\Model\OrderInterface as SyliusOrderInterface; diff --git a/spec/MessageHandler/EcommerceOrder/EcommerceOrderUpdateHandlerSpec.php b/spec/MessageHandler/EcommerceOrder/EcommerceOrderUpdateHandlerSpec.php index fb4d4e8..111b804 100644 --- a/spec/MessageHandler/EcommerceOrder/EcommerceOrderUpdateHandlerSpec.php +++ b/spec/MessageHandler/EcommerceOrder/EcommerceOrderUpdateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceOrder; -use App\Entity\Order\OrderInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\OrderInterface; use InvalidArgumentException; use PhpSpec\ObjectBehavior; use Sylius\Component\Core\Model\OrderInterface as SyliusOrderInterface; diff --git a/spec/MessageHandler/Webhook/WebhookCreateHandlerSpec.php b/spec/MessageHandler/Webhook/WebhookCreateHandlerSpec.php index 08a0128..4367a77 100644 --- a/spec/MessageHandler/Webhook/WebhookCreateHandlerSpec.php +++ b/spec/MessageHandler/Webhook/WebhookCreateHandlerSpec.php @@ -4,7 +4,7 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Webhook; -use App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; use InvalidArgumentException; use Sylius\Component\Channel\Repository\ChannelRepositoryInterface; use Sylius\Component\Core\Model\ChannelInterface as SyliusChannelInterface; diff --git a/spec/Resolver/ChannelCustomerBasedListSubscriptionStatusResolverSpec.php b/spec/Resolver/ChannelCustomerBasedListSubscriptionStatusResolverSpec.php index a979ff3..764855c 100644 --- a/spec/Resolver/ChannelCustomerBasedListSubscriptionStatusResolverSpec.php +++ b/spec/Resolver/ChannelCustomerBasedListSubscriptionStatusResolverSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Resolver; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Webgriffe\SyliusActiveCampaignPlugin\Exception\ChannelCustomerDoesNotExistException; use Webgriffe\SyliusActiveCampaignPlugin\Exception\ChannelListIdDoesNotExistException; use Webgriffe\SyliusActiveCampaignPlugin\Exception\CustomerListSubscriptionStatusNotDefinedException; diff --git a/spec/Resolver/CustomerBasedListSubscriptionStatusResolverSpec.php b/spec/Resolver/CustomerBasedListSubscriptionStatusResolverSpec.php index 3d7f946..cc9d16d 100644 --- a/spec/Resolver/CustomerBasedListSubscriptionStatusResolverSpec.php +++ b/spec/Resolver/CustomerBasedListSubscriptionStatusResolverSpec.php @@ -4,8 +4,8 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Resolver; -use App\Entity\Channel\ChannelInterface; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\ChannelInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Webgriffe\SyliusActiveCampaignPlugin\Exception\ChannelListIdDoesNotExistException; use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaign\ContactListInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ChannelCustomerInterface; diff --git a/spec/Updater/ChannelCustomerBasedListSubscriptionStatusUpdaterSpec.php b/spec/Updater/ChannelCustomerBasedListSubscriptionStatusUpdaterSpec.php index f55092d..01191dd 100644 --- a/spec/Updater/ChannelCustomerBasedListSubscriptionStatusUpdaterSpec.php +++ b/spec/Updater/ChannelCustomerBasedListSubscriptionStatusUpdaterSpec.php @@ -4,14 +4,13 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Updater; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use InvalidArgumentException; use Sylius\Component\Core\Model\ChannelInterface; use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface; use Sylius\Component\Resource\Repository\RepositoryInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaign\ContactListInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ChannelCustomerInterface; -use Webgriffe\SyliusActiveCampaignPlugin\Resolver\ListSubscriptionStatusResolverInterface; use Webgriffe\SyliusActiveCampaignPlugin\Updater\ChannelCustomerBasedListSubscriptionStatusUpdater; use PhpSpec\ObjectBehavior; use Webgriffe\SyliusActiveCampaignPlugin\Updater\ListSubscriptionStatusUpdaterInterface; diff --git a/spec/Updater/CustomerBasedListSubscriptionStatusUpdaterSpec.php b/spec/Updater/CustomerBasedListSubscriptionStatusUpdaterSpec.php index 471993d..8fba192 100644 --- a/spec/Updater/CustomerBasedListSubscriptionStatusUpdaterSpec.php +++ b/spec/Updater/CustomerBasedListSubscriptionStatusUpdaterSpec.php @@ -4,11 +4,10 @@ namespace spec\Webgriffe\SyliusActiveCampaignPlugin\Updater; -use App\Entity\Customer\CustomerInterface; +use Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\CustomerInterface; use Sylius\Component\Core\Model\ChannelInterface; use Sylius\Component\Core\Repository\CustomerRepositoryInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaign\ContactListInterface; -use Webgriffe\SyliusActiveCampaignPlugin\Resolver\ListSubscriptionStatusResolverInterface; use Webgriffe\SyliusActiveCampaignPlugin\Updater\CustomerBasedListSubscriptionStatusUpdater; use PhpSpec\ObjectBehavior; use Webgriffe\SyliusActiveCampaignPlugin\Updater\ListSubscriptionStatusUpdaterInterface; diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml index c7723d5..4fb1168 100644 --- a/tests/Application/config/packages/_sylius.yaml +++ b/tests/Application/config/packages/_sylius.yaml @@ -21,19 +21,19 @@ sylius_channel: resources: channel: classes: - model: App\Entity\Channel\Channel - repository: App\Doctrine\ORM\ChannelRepository + model: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel + repository: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM\ChannelRepository sylius_customer: resources: customer: classes: - model: App\Entity\Customer\Customer - repository: App\Doctrine\ORM\CustomerRepository + model: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer + repository: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM\CustomerRepository sylius_order: resources: order: classes: - model: App\Entity\Order\Order - repository: App\Doctrine\ORM\OrderRepository + model: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\Order + repository: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM\OrderRepository diff --git a/tests/Application/config/packages/doctrine.yaml b/tests/Application/config/packages/doctrine.yaml index 91fdbcf..cf4bba5 100644 --- a/tests/Application/config/packages/doctrine.yaml +++ b/tests/Application/config/packages/doctrine.yaml @@ -18,9 +18,9 @@ doctrine: default: auto_mapping: true mappings: - App: + Tests\Webgriffe\SyliusActiveCampaignPlugin\App: is_bundle: false type: annotation dir: '%kernel.project_dir%/src/Entity' - prefix: 'App\Entity' - alias: App + prefix: 'Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity' + alias: Tests\Webgriffe\SyliusActiveCampaignPlugin\App diff --git a/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml b/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml index 60ee84b..d0f23d8 100644 --- a/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml +++ b/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml @@ -11,4 +11,4 @@ webgriffe_sylius_active_campaign: resources: channel_customer: classes: - model: App\Entity\Customer\ChannelCustomer + model: Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\ChannelCustomer diff --git a/tests/Application/src/Doctrine/ORM/ChannelRepository.php b/tests/Application/src/Doctrine/ORM/ChannelRepository.php index ce4a282..9d3887b 100644 --- a/tests/Application/src/Doctrine/ORM/ChannelRepository.php +++ b/tests/Application/src/Doctrine/ORM/ChannelRepository.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Doctrine\ORM; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM; use Sylius\Bundle\ChannelBundle\Doctrine\ORM\ChannelRepository as BaseChannelRepository; use Webgriffe\SyliusActiveCampaignPlugin\Doctrine\ORM\ActiveCampaignChannelRepositoryTrait; diff --git a/tests/Application/src/Doctrine/ORM/CustomerRepository.php b/tests/Application/src/Doctrine/ORM/CustomerRepository.php index e32d796..c6d3c54 100644 --- a/tests/Application/src/Doctrine/ORM/CustomerRepository.php +++ b/tests/Application/src/Doctrine/ORM/CustomerRepository.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Doctrine\ORM; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM; use Sylius\Bundle\CoreBundle\Doctrine\ORM\CustomerRepository as BaseCustomerRepository; use Webgriffe\SyliusActiveCampaignPlugin\Doctrine\ORM\ActiveCampaignCustomerRepositoryTrait; diff --git a/tests/Application/src/Doctrine/ORM/OrderRepository.php b/tests/Application/src/Doctrine/ORM/OrderRepository.php index 06ce406..fb51738 100644 --- a/tests/Application/src/Doctrine/ORM/OrderRepository.php +++ b/tests/Application/src/Doctrine/ORM/OrderRepository.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Doctrine\ORM; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Doctrine\ORM; use Sylius\Bundle\CoreBundle\Doctrine\ORM\OrderRepository as BaseOrderRepository; use Webgriffe\SyliusActiveCampaignPlugin\Doctrine\ORM\ActiveCampaignOrderRepositoryTrait; diff --git a/tests/Application/src/Entity/Channel/Channel.php b/tests/Application/src/Entity/Channel/Channel.php index a17adc7..c92002e 100644 --- a/tests/Application/src/Entity/Channel/Channel.php +++ b/tests/Application/src/Entity/Channel/Channel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Channel; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel; use Doctrine\ORM\Mapping as ORM; use Sylius\Component\Core\Model\Channel as BaseChannel; diff --git a/tests/Application/src/Entity/Channel/ChannelInterface.php b/tests/Application/src/Entity/Channel/ChannelInterface.php index c537e0e..44e62da 100644 --- a/tests/Application/src/Entity/Channel/ChannelInterface.php +++ b/tests/Application/src/Entity/Channel/ChannelInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Channel; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel; use Sylius\Component\Core\Model\ChannelInterface as BaseChannelInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ChannelActiveCampaignAwareInterface; diff --git a/tests/Application/src/Entity/Customer/ChannelCustomer.php b/tests/Application/src/Entity/Customer/ChannelCustomer.php index d8e79bf..5f6da0a 100644 --- a/tests/Application/src/Entity/Customer/ChannelCustomer.php +++ b/tests/Application/src/Entity/Customer/ChannelCustomer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Customer; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer; use Doctrine\ORM\Mapping as ORM; use Webgriffe\SyliusActiveCampaignPlugin\Model\ChannelCustomer as BaseChannelCustomer; diff --git a/tests/Application/src/Entity/Customer/Customer.php b/tests/Application/src/Entity/Customer/Customer.php index 01f805e..f279769 100644 --- a/tests/Application/src/Entity/Customer/Customer.php +++ b/tests/Application/src/Entity/Customer/Customer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Customer; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer; use Doctrine\ORM\Mapping as ORM; use Sylius\Component\Core\Model\Customer as BaseCustomer; diff --git a/tests/Application/src/Entity/Customer/CustomerInterface.php b/tests/Application/src/Entity/Customer/CustomerInterface.php index 3c8e27c..09db78b 100644 --- a/tests/Application/src/Entity/Customer/CustomerInterface.php +++ b/tests/Application/src/Entity/Customer/CustomerInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Customer; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer; use Sylius\Component\Core\Model\CustomerInterface as BaseCustomerInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\CustomerActiveCampaignAwareInterface; diff --git a/tests/Application/src/Entity/Order/Order.php b/tests/Application/src/Entity/Order/Order.php index 249add1..a87ed29 100644 --- a/tests/Application/src/Entity/Order/Order.php +++ b/tests/Application/src/Entity/Order/Order.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Order; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order; use Doctrine\ORM\Mapping as ORM; use Sylius\Component\Core\Model\Order as BaseOrder; diff --git a/tests/Application/src/Entity/Order/OrderInterface.php b/tests/Application/src/Entity/Order/OrderInterface.php index be96d01..34d2b80 100644 --- a/tests/Application/src/Entity/Order/OrderInterface.php +++ b/tests/Application/src/Entity/Order/OrderInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Order; +namespace Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order; use Sylius\Component\Core\Model\OrderInterface as BaseOrderInterface; use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaignAwareInterface; diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueConnectionCommandTest/channels.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueConnectionCommandTest/channels.yaml index f12f285..27a5251 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueConnectionCommandTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueConnectionCommandTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/channels.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/channels.yaml index b045048..e4fd5ec 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/customers.yaml index 0071a45..29e9275 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueContactAndEcommerceCustomerCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' @@ -17,7 +17,7 @@ App\Entity\Customer\Customer: first_name: 'Samuel' last_name: 'Freud' -App\Entity\Customer\ChannelCustomer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\ChannelCustomer: customer_bob_fashion_shop: channel: "@fashion_shop" customer: "@customer_bob" diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueContactListsSubscriptionCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueContactListsSubscriptionCommandTest/customers.yaml index 49c7424..3c311ed 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueContactListsSubscriptionCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueContactListsSubscriptionCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueContactTagsAdderCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueContactTagsAdderCommandTest/customers.yaml index 49c7424..3c311ed 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueContactTagsAdderCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueContactTagsAdderCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/channels.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/channels.yaml index 367ff89..d3ff3e6 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/customers.yaml index e047e76..9807910 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/orders.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/orders.yaml index 9e8a98d..057f625 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/orders.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceAbandonedCartCommandTest/orders.yaml @@ -1,4 +1,4 @@ -App\Entity\Order\Order: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\Order: cart_already_abandoned: channel: '@fashion_shop' state: 'cart' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/channels.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/channels.yaml index 367ff89..d3ff3e6 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/customers.yaml index 8d19a75..a237689 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_01: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/orders.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/orders.yaml index efb4548..7fc3bf7 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/orders.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueEcommerceOrderCommandTest/orders.yaml @@ -1,4 +1,4 @@ -App\Entity\Order\Order: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\Order: order_1: channel: '@fashion_shop' number: '0001' diff --git a/tests/DataFixtures/ORM/resources/Command/EnqueueWebhookCommandTest/channels.yaml b/tests/DataFixtures/ORM/resources/Command/EnqueueWebhookCommandTest/channels.yaml index 2bec85d..3adf50a 100644 --- a/tests/DataFixtures/ORM/resources/Command/EnqueueWebhookCommandTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/Command/EnqueueWebhookCommandTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/Command/UpdateContactListsSubscriptionCommandTest/customers.yaml b/tests/DataFixtures/ORM/resources/Command/UpdateContactListsSubscriptionCommandTest/customers.yaml index 49c7424..3c311ed 100644 --- a/tests/DataFixtures/ORM/resources/Command/UpdateContactListsSubscriptionCommandTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Command/UpdateContactListsSubscriptionCommandTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/Controller/WebhookControllerTest/customers.yaml b/tests/DataFixtures/ORM/resources/Controller/WebhookControllerTest/customers.yaml index 59ef7a3..52ba8dd 100644 --- a/tests/DataFixtures/ORM/resources/Controller/WebhookControllerTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/Controller/WebhookControllerTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/ChannelSubscriberTest/channels.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/ChannelSubscriberTest/channels.yaml index 6ed385e..8de07d6 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/ChannelSubscriberTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/ChannelSubscriberTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/channels.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/channels.yaml index b045048..e4fd5ec 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/customers.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/customers.yaml index 3698c71..aea6d30 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/CustomerSubscriberTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' @@ -20,7 +20,7 @@ App\Entity\Customer\Customer: - "@customer_sam_fashion_shop" - "@customer_sam_digital_shop" -App\Entity\Customer\ChannelCustomer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\ChannelCustomer: customer_bob_fashion_shop: channel: "@fashion_shop" customer: "@customer_bob" diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/channels.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/channels.yaml index 367ff89..d3ff3e6 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/customers.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/customers.yaml index 272460a..139ac63 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_01: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/orders.yaml b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/orders.yaml index 5e07dd8..d94b763 100644 --- a/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/orders.yaml +++ b/tests/DataFixtures/ORM/resources/EventSubscriber/OrderSubscriberTest/orders.yaml @@ -1,4 +1,4 @@ -App\Entity\Order\Order: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\Order: order_1: channel: '@fashion_shop' number: '0001' diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/ConnectionCreateHandlerTest/channels.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/ConnectionCreateHandlerTest/channels.yaml index 36c0790..8e40020 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/ConnectionCreateHandlerTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/ConnectionCreateHandlerTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/ContactCreateHandlerTest/customers.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/ContactCreateHandlerTest/customers.yaml index 57555bb..369b006 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/ContactCreateHandlerTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/ContactCreateHandlerTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/channels.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/channels.yaml index 411002c..ab5d774 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/customers.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/customers.yaml index 57555bb..369b006 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceCustomerCreateHandlerTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_jim: email: 'jim@email.com' first_name: 'James' diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/channels.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/channels.yaml index c8ef500..76b7212 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/channels.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/channels.yaml @@ -1,4 +1,4 @@ -App\Entity\Channel\Channel: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Channel\Channel: fashion_shop: code: "fashion_shop" name: "Fashion shop" diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/customers.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/customers.yaml index 214394a..3b91b1b 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/customers.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/customers.yaml @@ -1,4 +1,4 @@ -App\Entity\Customer\Customer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\Customer: customer_01: email: 'jim@email.com' first_name: 'James' @@ -6,7 +6,7 @@ App\Entity\Customer\Customer: channelCustomers: - "@customer_01_fashion_shop" -App\Entity\Customer\ChannelCustomer: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Customer\ChannelCustomer: customer_01_fashion_shop: channel: "@fashion_shop" customer: "@customer_01" diff --git a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/orders.yaml b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/orders.yaml index e1dd572..151a2f2 100644 --- a/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/orders.yaml +++ b/tests/DataFixtures/ORM/resources/MessageHandler/EcommerceOrderCreateHandlerTest/orders.yaml @@ -1,4 +1,4 @@ -App\Entity\Order\Order: +Tests\Webgriffe\SyliusActiveCampaignPlugin\App\Entity\Order\Order: order_1: channel: '@fashion_shop' number: '0001' From 2a695c75e3de0dc8977435faa5a606cb750d79f4 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruozzi Date: Mon, 7 Aug 2023 12:23:08 +0200 Subject: [PATCH 2/2] Use new Symfony bundle directory structure (#63) --- UPGRADE-0.X.md | 16 ++++++++++++++++ {src/Resources/config => config}/app/config.yaml | 0 {src/Resources/config => config}/app_routing.yml | 0 .../doctrine/model/ChannelCustomer.orm.xml | 0 .../config => config}/serialization.xml | 0 {src/Resources/config => config}/services.xml | 0 .../config => config}/services/client.xml | 0 .../config => config}/services/command.xml | 0 .../config => config}/services/controller.xml | 0 .../config => config}/services/enqueuer.xml | 0 .../services/event_subscriber.xml | 0 .../config => config}/services/factory.xml | 0 .../config => config}/services/form.xml | 0 .../config => config}/services/generator.xml | 0 .../config => config}/services/http_client.xml | 0 .../config => config}/services/logger.xml | 0 .../config => config}/services/mapper.xml | 0 .../services/message_handler.xml | 0 .../config => config}/services/middleware.xml | 0 .../config => config}/services/resolver.xml | 0 .../config => config}/services/serializer.xml | 0 .../config => config}/services/twig.xml | 0 .../config => config}/services/updater.xml | 0 docs/01-Requirements.md | 3 ++- docs/02-Installation.md | 4 ++-- .../WebgriffeSyliusActiveCampaignExtension.php | 2 +- src/WebgriffeSyliusActiveCampaignPlugin.php | 12 +++++++++++- .../Admin/Channel/_form.html.twig | 0 .../Shop/_active_campaign_tracking.html.twig | 0 .../webgriffe_sylius_active_campaign_plugin.yaml | 2 +- tests/Application/config/routes.yaml | 2 +- .../messages.en.yaml | 0 .../messages.it.yaml | 0 33 files changed, 34 insertions(+), 7 deletions(-) rename {src/Resources/config => config}/app/config.yaml (100%) rename {src/Resources/config => config}/app_routing.yml (100%) rename {src/Resources/config => config}/doctrine/model/ChannelCustomer.orm.xml (100%) rename {src/Resources/config => config}/serialization.xml (100%) rename {src/Resources/config => config}/services.xml (100%) rename {src/Resources/config => config}/services/client.xml (100%) rename {src/Resources/config => config}/services/command.xml (100%) rename {src/Resources/config => config}/services/controller.xml (100%) rename {src/Resources/config => config}/services/enqueuer.xml (100%) rename {src/Resources/config => config}/services/event_subscriber.xml (100%) rename {src/Resources/config => config}/services/factory.xml (100%) rename {src/Resources/config => config}/services/form.xml (100%) rename {src/Resources/config => config}/services/generator.xml (100%) rename {src/Resources/config => config}/services/http_client.xml (100%) rename {src/Resources/config => config}/services/logger.xml (100%) rename {src/Resources/config => config}/services/mapper.xml (100%) rename {src/Resources/config => config}/services/message_handler.xml (100%) rename {src/Resources/config => config}/services/middleware.xml (100%) rename {src/Resources/config => config}/services/resolver.xml (100%) rename {src/Resources/config => config}/services/serializer.xml (100%) rename {src/Resources/config => config}/services/twig.xml (100%) rename {src/Resources/config => config}/services/updater.xml (100%) rename {src/Resources/views => templates}/Admin/Channel/_form.html.twig (100%) rename {src/Resources/views => templates}/Shop/_active_campaign_tracking.html.twig (100%) rename {src/Resources/translations => translations}/messages.en.yaml (100%) rename {src/Resources/translations => translations}/messages.it.yaml (100%) diff --git a/UPGRADE-0.X.md b/UPGRADE-0.X.md index e62a4f3..d042dc5 100644 --- a/UPGRADE-0.X.md +++ b/UPGRADE-0.X.md @@ -1,5 +1,21 @@ # UPGRADE FROM `v0.1.0` TO `v0.X` +## UPGRADE FROM `v0.6.0` TO `v0.7.0` + +The plugin directory structure has been updated to follow the Symfony bundle best practices. +Adjust your `config/packages/webgriffe_sylius_active_campaign_plugin.yaml` file by removing the word `Resources`: +```diff +- - { resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app/config.yaml" } ++ - { resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app/config.yaml" } +``` + +Update your route config import file by removing the word `Resources`: +```diff +webgriffe_sylius_active_campaign_shop: +- resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app_routing.yml" ++ resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app_routing.yml" +``` + ## UPGRADE FROM `v0.2.0` TO `v0.3.0` Adjust you entity following the subsequent PR notes, then remember to run a migration diff and run it with: diff --git a/src/Resources/config/app/config.yaml b/config/app/config.yaml similarity index 100% rename from src/Resources/config/app/config.yaml rename to config/app/config.yaml diff --git a/src/Resources/config/app_routing.yml b/config/app_routing.yml similarity index 100% rename from src/Resources/config/app_routing.yml rename to config/app_routing.yml diff --git a/src/Resources/config/doctrine/model/ChannelCustomer.orm.xml b/config/doctrine/model/ChannelCustomer.orm.xml similarity index 100% rename from src/Resources/config/doctrine/model/ChannelCustomer.orm.xml rename to config/doctrine/model/ChannelCustomer.orm.xml diff --git a/src/Resources/config/serialization.xml b/config/serialization.xml similarity index 100% rename from src/Resources/config/serialization.xml rename to config/serialization.xml diff --git a/src/Resources/config/services.xml b/config/services.xml similarity index 100% rename from src/Resources/config/services.xml rename to config/services.xml diff --git a/src/Resources/config/services/client.xml b/config/services/client.xml similarity index 100% rename from src/Resources/config/services/client.xml rename to config/services/client.xml diff --git a/src/Resources/config/services/command.xml b/config/services/command.xml similarity index 100% rename from src/Resources/config/services/command.xml rename to config/services/command.xml diff --git a/src/Resources/config/services/controller.xml b/config/services/controller.xml similarity index 100% rename from src/Resources/config/services/controller.xml rename to config/services/controller.xml diff --git a/src/Resources/config/services/enqueuer.xml b/config/services/enqueuer.xml similarity index 100% rename from src/Resources/config/services/enqueuer.xml rename to config/services/enqueuer.xml diff --git a/src/Resources/config/services/event_subscriber.xml b/config/services/event_subscriber.xml similarity index 100% rename from src/Resources/config/services/event_subscriber.xml rename to config/services/event_subscriber.xml diff --git a/src/Resources/config/services/factory.xml b/config/services/factory.xml similarity index 100% rename from src/Resources/config/services/factory.xml rename to config/services/factory.xml diff --git a/src/Resources/config/services/form.xml b/config/services/form.xml similarity index 100% rename from src/Resources/config/services/form.xml rename to config/services/form.xml diff --git a/src/Resources/config/services/generator.xml b/config/services/generator.xml similarity index 100% rename from src/Resources/config/services/generator.xml rename to config/services/generator.xml diff --git a/src/Resources/config/services/http_client.xml b/config/services/http_client.xml similarity index 100% rename from src/Resources/config/services/http_client.xml rename to config/services/http_client.xml diff --git a/src/Resources/config/services/logger.xml b/config/services/logger.xml similarity index 100% rename from src/Resources/config/services/logger.xml rename to config/services/logger.xml diff --git a/src/Resources/config/services/mapper.xml b/config/services/mapper.xml similarity index 100% rename from src/Resources/config/services/mapper.xml rename to config/services/mapper.xml diff --git a/src/Resources/config/services/message_handler.xml b/config/services/message_handler.xml similarity index 100% rename from src/Resources/config/services/message_handler.xml rename to config/services/message_handler.xml diff --git a/src/Resources/config/services/middleware.xml b/config/services/middleware.xml similarity index 100% rename from src/Resources/config/services/middleware.xml rename to config/services/middleware.xml diff --git a/src/Resources/config/services/resolver.xml b/config/services/resolver.xml similarity index 100% rename from src/Resources/config/services/resolver.xml rename to config/services/resolver.xml diff --git a/src/Resources/config/services/serializer.xml b/config/services/serializer.xml similarity index 100% rename from src/Resources/config/services/serializer.xml rename to config/services/serializer.xml diff --git a/src/Resources/config/services/twig.xml b/config/services/twig.xml similarity index 100% rename from src/Resources/config/services/twig.xml rename to config/services/twig.xml diff --git a/src/Resources/config/services/updater.xml b/config/services/updater.xml similarity index 100% rename from src/Resources/config/services/updater.xml rename to config/services/updater.xml diff --git a/docs/01-Requirements.md b/docs/01-Requirements.md index 99f6f28..0786233 100644 --- a/docs/01-Requirements.md +++ b/docs/01-Requirements.md @@ -3,4 +3,5 @@ [Return to Summary main page](README.md) * PHP `^8.0` or higher -* Sylius `^1.11` +* Sylius `^1.12` +* Symfony `^5.4` or `^6.0` diff --git a/docs/02-Installation.md b/docs/02-Installation.md index 64e2df9..ffd0acd 100644 --- a/docs/02-Installation.md +++ b/docs/02-Installation.md @@ -12,7 +12,7 @@ 3. Configure your ActiveCampaign API connection parameters by creating the `config/packages/webgriffe_sylius_active_campaign_plugin.yaml` file with the following content: ```yaml imports: - - { resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app/config.yaml" } + - { resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app/config.yaml" } webgriffe_sylius_active_campaign: api_client: @@ -26,7 +26,7 @@ 4. Import the routes needed for updating the list status of contact (you can omit this if you don't need to update the list status, or you don't use the list subscription feature). Add the following to your `config/routes.yaml` file: ```yaml webgriffe_sylius_active_campaign_shop: - resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app_routing.yml" + resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app_routing.yml" ``` Note that these routes shouldn't be inside your "shop routes", the locale parameter is not needed. diff --git a/src/DependencyInjection/WebgriffeSyliusActiveCampaignExtension.php b/src/DependencyInjection/WebgriffeSyliusActiveCampaignExtension.php index 839e4ae..0187029 100644 --- a/src/DependencyInjection/WebgriffeSyliusActiveCampaignExtension.php +++ b/src/DependencyInjection/WebgriffeSyliusActiveCampaignExtension.php @@ -18,7 +18,7 @@ final class WebgriffeSyliusActiveCampaignExtension extends AbstractResourceExten public function load(array $configs, ContainerBuilder $container): void { $config = $this->processConfiguration($this->getConfiguration([], $container), $configs); - $fileLocator = new FileLocator(__DIR__ . '/../Resources/config'); + $fileLocator = new FileLocator(__DIR__ . '/../../config'); $loader = new XmlFileLoader($container, $fileLocator); $this->registerResources('webgriffe_sylius_active_campaign', $config['driver'], $config['resources'], $container); diff --git a/src/WebgriffeSyliusActiveCampaignPlugin.php b/src/WebgriffeSyliusActiveCampaignPlugin.php index 0b56972..98c416d 100644 --- a/src/WebgriffeSyliusActiveCampaignPlugin.php +++ b/src/WebgriffeSyliusActiveCampaignPlugin.php @@ -7,6 +7,7 @@ use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait; use Sylius\Bundle\ResourceBundle\AbstractResourceBundle; use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; +use function dirname; final class WebgriffeSyliusActiveCampaignPlugin extends AbstractResourceBundle { @@ -21,11 +22,20 @@ public function getSupportedDrivers(): array public function getPath(): string { - return __DIR__; + return dirname(__DIR__); } protected function getModelNamespace(): string { return 'Webgriffe\SyliusActiveCampaignPlugin\Model'; } + + protected function getConfigFilesPath(): string + { + return sprintf( + '%s/config/doctrine/%s', + $this->getPath(), + strtolower($this->getDoctrineMappingDirectory()), + ); + } } diff --git a/src/Resources/views/Admin/Channel/_form.html.twig b/templates/Admin/Channel/_form.html.twig similarity index 100% rename from src/Resources/views/Admin/Channel/_form.html.twig rename to templates/Admin/Channel/_form.html.twig diff --git a/src/Resources/views/Shop/_active_campaign_tracking.html.twig b/templates/Shop/_active_campaign_tracking.html.twig similarity index 100% rename from src/Resources/views/Shop/_active_campaign_tracking.html.twig rename to templates/Shop/_active_campaign_tracking.html.twig diff --git a/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml b/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml index d0f23d8..afc774a 100644 --- a/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml +++ b/tests/Application/config/packages/webgriffe_sylius_active_campaign_plugin.yaml @@ -1,5 +1,5 @@ imports: - - { resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app/config.yaml" } + - { resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app/config.yaml" } webgriffe_sylius_active_campaign: api_client: diff --git a/tests/Application/config/routes.yaml b/tests/Application/config/routes.yaml index b8baf49..8d74370 100644 --- a/tests/Application/config/routes.yaml +++ b/tests/Application/config/routes.yaml @@ -1,2 +1,2 @@ webgriffe_sylius_active_campaign_shop: - resource: "@WebgriffeSyliusActiveCampaignPlugin/Resources/config/app_routing.yml" + resource: "@WebgriffeSyliusActiveCampaignPlugin/config/app_routing.yml" diff --git a/src/Resources/translations/messages.en.yaml b/translations/messages.en.yaml similarity index 100% rename from src/Resources/translations/messages.en.yaml rename to translations/messages.en.yaml diff --git a/src/Resources/translations/messages.it.yaml b/translations/messages.it.yaml similarity index 100% rename from src/Resources/translations/messages.it.yaml rename to translations/messages.it.yaml