[Core] Reorganize namespaces of services related with catalog promotions

Sylius · Feb 10, 2022 · 7cf8b7b · 7cf8b7b
1 parent 03cd14f
commit 7cf8b7b
Show file tree

Hide file tree

Showing 125 changed files with 604 additions and 478 deletions.
diff --git a/docs/cookbook/promotions/custom-catalog-promotion-action.rst b/docs/cookbook/promotions/custom-catalog-promotion-action.rst
@@ -40,7 +40,7 @@ And the code for the calculator itself:
     namespace App\Calculator;
 
     use App\Model\CatalogPromotionActionInterface;
-    use Sylius\Bundle\CoreBundle\Calculator\ActionBasedPriceCalculatorInterface;
+    use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\ActionBasedPriceCalculatorInterface;
     use Sylius\Component\Core\Model\ChannelPricingInterface;
     use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface as BaseCatalogPromotionActionInterface;
 

diff --git a/docs/cookbook/promotions/custom-catalog-promotion-scope.rst b/docs/cookbook/promotions/custom-catalog-promotion-scope.rst
@@ -87,8 +87,8 @@ keys to check as well as their corresponding values.
 
     namespace App\Validator\CatalogPromotionScope;
 
-    use Sylius\Bundle\CoreBundle\Validator\CatalogPromotionScope\ScopeValidatorInterface;
-    use Sylius\Bundle\CoreBundle\Validator\Constraints\CatalogPromotionScope;
+    use Sylius\Bundle\CoreBundle\CatalogPromotion\Validator\CatalogPromotionScope\ScopeValidatorInterface;
+    use Sylius\Bundle\CoreBundle\CatalogPromotion\Validator\Constraints\CatalogPromotionScope;
     use Symfony\Component\Validator\Constraint;
     use Symfony\Component\Validator\Context\ExecutionContextInterface;
     use Webmozart\Assert\Assert;

diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -18,11 +18,11 @@
 use Sylius\Behat\Client\ApiClientInterface;
 use Sylius\Behat\Client\ResponseCheckerInterface;
 use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Bundle\CoreBundle\Calculator\FixedDiscountPriceCalculator;
-use Sylius\Bundle\CoreBundle\Calculator\PercentageDiscountPriceCalculator;
-use Sylius\Bundle\CoreBundle\Checker\InForProductScopeVariantChecker;
-use Sylius\Bundle\CoreBundle\Checker\InForTaxonsScopeVariantChecker;
-use Sylius\Bundle\CoreBundle\Checker\InForVariantsScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\FixedDiscountPriceCalculator;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\PercentageDiscountPriceCalculator;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForProductScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForTaxonsScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForVariantsScopeVariantChecker;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Promotion\Event\CatalogPromotionCreated;
 use Sylius\Component\Core\Model\ChannelInterface;

diff --git a/src/Sylius/Behat/Context/Setup/CatalogPromotionContext.php b/src/Sylius/Behat/Context/Setup/CatalogPromotionContext.php
@@ -17,11 +17,11 @@
 use Doctrine\ORM\EntityManagerInterface;
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Bundle\CoreBundle\Calculator\FixedDiscountPriceCalculator;
-use Sylius\Bundle\CoreBundle\Calculator\PercentageDiscountPriceCalculator;
-use Sylius\Bundle\CoreBundle\Checker\InForProductScopeVariantChecker;
-use Sylius\Bundle\CoreBundle\Checker\InForTaxonsScopeVariantChecker;
-use Sylius\Bundle\CoreBundle\Checker\InForVariantsScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\FixedDiscountPriceCalculator;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\PercentageDiscountPriceCalculator;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForProductScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForTaxonsScopeVariantChecker;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\InForVariantsScopeVariantChecker;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Formatter\StringInflector;

diff --git a/src/Sylius/Bundle/ApiBundle/EventSubscriber/CatalogPromotionEventSubscriber.php b/src/Sylius/Bundle/ApiBundle/EventSubscriber/CatalogPromotionEventSubscriber.php
@@ -14,7 +14,7 @@
 namespace Sylius\Bundle\ApiBundle\EventSubscriber;
 
 use ApiPlatform\Core\EventListener\EventPriorities;
-use Sylius\Bundle\CoreBundle\Announcer\CatalogPromotionAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncerInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml
@@ -24,7 +24,7 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\EventSubscriber\CatalogPromotionEventSubscriber">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\Announcer\CatalogPromotionAnnouncerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncerInterface" />
             <tag name="kernel.event_subscriber" />
         </service>
 

diff --git a/src/Sylius/Bundle/ApiBundle/spec/EventSubscriber/CatalogPromotionEventSubscriberSpec.php b/src/Sylius/Bundle/ApiBundle/spec/EventSubscriber/CatalogPromotionEventSubscriberSpec.php
@@ -15,7 +15,7 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\CoreBundle\Announcer\CatalogPromotionAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncerInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ViewEvent;

diff --git a/...e/Announcer/CatalogPromotionAnnouncer.php → ...n/Announcer/CatalogPromotionAnnouncer.php b/...e/Announcer/CatalogPromotionAnnouncer.php → ...n/Announcer/CatalogPromotionAnnouncer.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Announcer;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer;
 
 use Sylius\Bundle\CoreBundle\Calculator\DelayStampCalculatorInterface;
 use Sylius\Calendar\Provider\DateTimeProviderInterface;

diff --git a/...er/CatalogPromotionAnnouncerInterface.php → ...er/CatalogPromotionAnnouncerInterface.php b/...er/CatalogPromotionAnnouncerInterface.php → ...er/CatalogPromotionAnnouncerInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Announcer;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 

diff --git a/...licator/ActionBasedDiscountApplicator.php → ...licator/ActionBasedDiscountApplicator.php b/...licator/ActionBasedDiscountApplicator.php → ...licator/ActionBasedDiscountApplicator.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Applicator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Applicator;
 
-use Sylius\Bundle\CoreBundle\Calculator\CatalogPromotionPriceCalculatorInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator\CatalogPromotionPriceCalculatorInterface;
 use Sylius\Bundle\PromotionBundle\DiscountApplicationCriteria\DiscountApplicationCriteriaInterface;
 use Sylius\Component\Core\Exception\ActionBasedPriceCalculatorNotFoundException;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;

diff --git a/...ctionBasedDiscountApplicatorInterface.php → ...ctionBasedDiscountApplicatorInterface.php b/...ctionBasedDiscountApplicatorInterface.php → ...ctionBasedDiscountApplicatorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Applicator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Applicator;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;

diff --git a/...Applicator/CatalogPromotionApplicator.php → ...Applicator/CatalogPromotionApplicator.php b/...Applicator/CatalogPromotionApplicator.php → ...Applicator/CatalogPromotionApplicator.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Applicator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Applicator;
 
-use Sylius\Bundle\CoreBundle\Checker\CatalogPromotionEligibilityCheckerInterface;
-use Sylius\Bundle\CoreBundle\Checker\ProductVariantForCatalogPromotionEligibilityInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\CatalogPromotionEligibilityCheckerInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Checker\ProductVariantForCatalogPromotionEligibilityInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;

diff --git a/...r/CatalogPromotionApplicatorInterface.php → ...r/CatalogPromotionApplicatorInterface.php b/...r/CatalogPromotionApplicatorInterface.php → ...r/CatalogPromotionApplicatorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Applicator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Applicator;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;

diff --git a/...r/ActionBasedPriceCalculatorInterface.php → ...r/ActionBasedPriceCalculatorInterface.php b/...r/ActionBasedPriceCalculatorInterface.php → ...r/ActionBasedPriceCalculatorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Calculator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator;
 
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;

diff --git a/...lator/CatalogPromotionPriceCalculator.php → ...lator/CatalogPromotionPriceCalculator.php b/...lator/CatalogPromotionPriceCalculator.php → ...lator/CatalogPromotionPriceCalculator.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Calculator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator;
 
 use Sylius\Component\Core\Exception\ActionBasedPriceCalculatorNotFoundException;
 use Sylius\Component\Core\Model\ChannelPricingInterface;

diff --git a/...alogPromotionPriceCalculatorInterface.php → ...alogPromotionPriceCalculatorInterface.php b/...alogPromotionPriceCalculatorInterface.php → ...alogPromotionPriceCalculatorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Calculator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator;
 
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;

diff --git a/...lculator/FixedDiscountPriceCalculator.php → ...lculator/FixedDiscountPriceCalculator.php b/...lculator/FixedDiscountPriceCalculator.php → ...lculator/FixedDiscountPriceCalculator.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Calculator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator;
 
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;

diff --git a/...tor/PercentageDiscountPriceCalculator.php → ...tor/PercentageDiscountPriceCalculator.php b/...tor/PercentageDiscountPriceCalculator.php → ...tor/PercentageDiscountPriceCalculator.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Calculator;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Calculator;
 
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;

diff --git a/...er/CatalogPromotionEligibilityChecker.php → ...er/CatalogPromotionEligibilityChecker.php b/...er/CatalogPromotionEligibilityChecker.php → ...er/CatalogPromotionEligibilityChecker.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 

diff --git a/...gPromotionEligibilityCheckerInterface.php → ...gPromotionEligibilityCheckerInterface.php b/...gPromotionEligibilityCheckerInterface.php → ...gPromotionEligibilityCheckerInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 

diff --git a/...ecker/InForProductScopeVariantChecker.php → ...ecker/InForProductScopeVariantChecker.php b/...ecker/InForProductScopeVariantChecker.php → ...ecker/InForProductScopeVariantChecker.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionScopeInterface;

diff --git a/...hecker/InForTaxonsScopeVariantChecker.php → ...hecker/InForTaxonsScopeVariantChecker.php b/...hecker/InForTaxonsScopeVariantChecker.php → ...hecker/InForTaxonsScopeVariantChecker.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;

diff --git a/...cker/InForVariantsScopeVariantChecker.php → ...cker/InForVariantsScopeVariantChecker.php b/...cker/InForVariantsScopeVariantChecker.php → ...cker/InForVariantsScopeVariantChecker.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionScopeInterface;

diff --git a/...VariantForCatalogPromotionEligibility.php → ...VariantForCatalogPromotionEligibility.php b/...VariantForCatalogPromotionEligibility.php → ...VariantForCatalogPromotionEligibility.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;

diff --git a/...rCatalogPromotionEligibilityInterface.php → ...rCatalogPromotionEligibilityInterface.php b/...rCatalogPromotionEligibilityInterface.php → ...rCatalogPromotionEligibilityInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;

diff --git a/...hecker/VariantInScopeCheckerInterface.php → ...hecker/VariantInScopeCheckerInterface.php b/...hecker/VariantInScopeCheckerInterface.php → ...hecker/VariantInScopeCheckerInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Checker;
 
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionScopeInterface;

diff --git a/...mand/ApplyCatalogPromotionsOnVariants.php → ...mand/ApplyCatalogPromotionsOnVariants.php b/...mand/ApplyCatalogPromotionsOnVariants.php → ...mand/ApplyCatalogPromotionsOnVariants.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Command;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Command;
 
 final class ApplyCatalogPromotionsOnVariants
 {

diff --git a/...sOnVariantsCommandDispatcherInterface.php → ...sOnVariantsCommandDispatcherInterface.php b/...sOnVariantsCommandDispatcherInterface.php → ...sOnVariantsCommandDispatcherInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\CommandDispatcher;
 
 interface ApplyCatalogPromotionsOnVariantsCommandDispatcherInterface
 {

diff --git a/...PromotionsOnVariantsCommandDispatcher.php → ...PromotionsOnVariantsCommandDispatcher.php b/...PromotionsOnVariantsCommandDispatcher.php → ...PromotionsOnVariantsCommandDispatcher.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\CommandDispatcher;
 
-use Sylius\Bundle\CoreBundle\Command\ApplyCatalogPromotionsOnVariants;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Command\ApplyCatalogPromotionsOnVariants;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class BatchedApplyCatalogPromotionsOnVariantsCommandDispatcher implements ApplyCatalogPromotionsOnVariantsCommandDispatcherInterface

diff --git a/...plyCatalogPromotionsOnVariantsHandler.php → ...plyCatalogPromotionsOnVariantsHandler.php b/...plyCatalogPromotionsOnVariantsHandler.php → ...plyCatalogPromotionsOnVariantsHandler.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\CommandHandler;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\CommandHandler;
 
-use Sylius\Bundle\CoreBundle\Applicator\CatalogPromotionApplicatorInterface;
-use Sylius\Bundle\CoreBundle\Command\ApplyCatalogPromotionsOnVariants;
-use Sylius\Bundle\CoreBundle\Processor\CatalogPromotionClearerInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Applicator\CatalogPromotionApplicatorInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Command\ApplyCatalogPromotionsOnVariants;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\CatalogPromotionClearerInterface;
 use Sylius\Bundle\PromotionBundle\Provider\EligibleCatalogPromotionsProviderInterface;
 use Sylius\Component\Core\Repository\ProductVariantRepositoryInterface;
 

diff --git a/.../Bundle/CoreBundle/CatalogPromotion/CommandHandler/UpdateCatalogPromotionStateHandler.php b/.../Bundle/CoreBundle/CatalogPromotion/CommandHandler/UpdateCatalogPromotionStateHandler.php
@@ -14,7 +14,7 @@
 namespace Sylius\Bundle\CoreBundle\CatalogPromotion\CommandHandler;
 
 use Sylius\Bundle\CoreBundle\CatalogPromotion\Command\UpdateCatalogPromotionState;
-use Sylius\Bundle\CoreBundle\Processor\CatalogPromotionStateProcessorInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\CatalogPromotionStateProcessorInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 

diff --git a/...ApplicationCriteria/ExclusiveCriteria.php → ...ApplicationCriteria/ExclusiveCriteria.php b/...ApplicationCriteria/ExclusiveCriteria.php → ...ApplicationCriteria/ExclusiveCriteria.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\DiscountApplicationCriteria;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\DiscountApplicationCriteria;
 
 use Sylius\Bundle\PromotionBundle\DiscountApplicationCriteria\DiscountApplicationCriteriaInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;

diff --git a/...licationCriteria/MinimumPriceCriteria.php → ...licationCriteria/MinimumPriceCriteria.php b/...licationCriteria/MinimumPriceCriteria.php → ...licationCriteria/MinimumPriceCriteria.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\DiscountApplicationCriteria;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\DiscountApplicationCriteria;
 
 use Sylius\Bundle\PromotionBundle\DiscountApplicationCriteria\DiscountApplicationCriteriaInterface;
 use Sylius\Component\Promotion\Model\CatalogPromotionInterface;

diff --git a/...istener/CatalogPromotionEventListener.php → ...istener/CatalogPromotionEventListener.php b/...istener/CatalogPromotionEventListener.php → ...istener/CatalogPromotionEventListener.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\EventListener;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\EventListener;
 
-use Sylius\Bundle\CoreBundle\Announcer\CatalogPromotionAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncerInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Webmozart\Assert\Assert;

diff --git a/...le/EventListener/ProductEventListener.php → ...on/EventListener/ProductEventListener.php b/...le/EventListener/ProductEventListener.php → ...on/EventListener/ProductEventListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\EventListener;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\EventListener;
 
 use Sylius\Component\Core\Event\ProductCreated;
 use Sylius\Component\Core\Event\ProductUpdated;

diff --git a/...tListener/ProductVariantEventListener.php → ...tListener/ProductVariantEventListener.php b/...tListener/ProductVariantEventListener.php → ...tListener/ProductVariantEventListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\EventListener;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\EventListener;
 
 use Sylius\Component\Core\Event\ProductVariantCreated;
 use Sylius\Component\Core\Event\ProductVariantUpdated;

diff --git a/...tener/CatalogPromotionCreatedListener.php → ...tener/CatalogPromotionCreatedListener.php b/...tener/CatalogPromotionCreatedListener.php → ...tener/CatalogPromotionCreatedListener.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Listener;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Listener;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Sylius\Bundle\CoreBundle\Processor\AllProductVariantsCatalogPromotionsProcessorInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\AllProductVariantsCatalogPromotionsProcessorInterface;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Promotion\Event\CatalogPromotionCreated;
 use Sylius\Component\Resource\Repository\RepositoryInterface;

diff --git a/...istener/CatalogPromotionEndedListener.php → ...istener/CatalogPromotionEndedListener.php b/...istener/CatalogPromotionEndedListener.php → ...istener/CatalogPromotionEndedListener.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\Listener;
+namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Listener;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Sylius\Bundle\CoreBundle\Processor\AllProductVariantsCatalogPromotionsProcessorInterface;
+use Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\AllProductVariantsCatalogPromotionsProcessorInterface;
 use Sylius\Component\Promotion\Event\CatalogPromotionEnded;
 use Sylius\Component\Resource\Repository\RepositoryInterface;