Fixes after PR review

Sylius · May 13, 2019 · 93cd924 · 93cd924
1 parent 1e82d3c
commit 93cd924
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 22 deletions.
diff --git a/src/Sylius/Behat/Service/NotificationChecker.php b/src/Sylius/Behat/Service/NotificationChecker.php
@@ -16,6 +16,7 @@
 use Sylius\Behat\Exception\NotificationExpectationMismatchException;
 use Sylius\Behat\NotificationType;
 use Sylius\Behat\Service\Accessor\NotificationAccessorInterface;
+use Webmozart\Assert\Assert;
 
 final class NotificationChecker implements NotificationCheckerInterface
 {
@@ -46,10 +47,14 @@ public function checkNotification(string $message, NotificationType $type): void
 
     private function resolveClass(NotificationType $type): string
     {
-        if ($type->__toString() === 'info') {
-            return 'info';
-        }
+        $typeClassMap = [
+            'failure' => 'negative',
+            'info' => 'info',
+            'success' => 'positive',
+        ];
+
+        Assert::keyExists($typeClassMap, $type->__toString());
 
-        return $type->__toString() === 'success' ? 'positive' : 'negative';
+        return $typeClassMap[$type->__toString()];
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php b/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php
@@ -31,7 +31,6 @@ final class TaxonDeletionListener
     public function __construct(
         SessionInterface $session,
         TaxonAwareRuleUpdaterInterface ...$ruleUpdaters
-
     ) {
         $this->session = $session;
         $this->ruleUpdaters = $ruleUpdaters;
@@ -44,7 +43,7 @@ public function removeTaxonFromPromotionRules(GenericEvent $event): void
 
         $updatedPromotionCodes = [];
         foreach ($this->ruleUpdaters as $ruleUpdater) {
-            $updatedPromotionCodes = array_merge($updatedPromotionCodes, $ruleUpdater->updateAfterDeletingTaxon($taxon->getCode()));
+            $updatedPromotionCodes = array_merge($updatedPromotionCodes, $ruleUpdater->updateAfterDeletingTaxon($taxon));
         }
 
         if (!empty($updatedPromotionCodes)) {

diff --git a/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php
@@ -39,10 +39,9 @@ function it_adds_flash_that_promotions_have_been_updated(
         TaxonInterface $taxon
     ): void {
         $event->getSubject()->willReturn($taxon);
-        $taxon->getCode()->willReturn('toys');
 
-        $hasTaxonRuleUpdater->updateAfterDeletingTaxon('toys')->willReturn(['christmas', 'holiday']);
-        $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon('toys')->willReturn(['christmas']);
+        $hasTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn(['christmas', 'holiday']);
+        $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn(['christmas']);
 
         $session->getBag('flashes')->willReturn($flashes);
         $flashes
@@ -64,10 +63,9 @@ function it_does_nothing_if_no_promotion_has_been_updated(
         TaxonInterface $taxon
     ): void {
         $event->getSubject()->willReturn($taxon);
-        $taxon->getCode()->willReturn('toys');
 
-        $hasTaxonRuleUpdater->updateAfterDeletingTaxon('toys')->willReturn([]);
-        $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon('toys')->willReturn([]);
+        $hasTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn([]);
+        $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn([]);
 
         $session->getBag('flashes')->shouldNotBeCalled();
 

diff --git a/src/Sylius/Component/Core/Promotion/Updater/Rule/HasTaxonRuleUpdater.php b/src/Sylius/Component/Core/Promotion/Updater/Rule/HasTaxonRuleUpdater.php
@@ -14,6 +14,7 @@
 namespace Sylius\Component\Core\Promotion\Updater\Rule;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Core\Promotion\Checker\Rule\HasTaxonRuleChecker;
 use Sylius\Component\Promotion\Model\PromotionRuleInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
@@ -32,16 +33,16 @@ public function __construct(RepositoryInterface $promotionRuleRepository, Entity
         $this->manager = $manager;
     }
 
-    public function updateAfterDeletingTaxon(string $taxonCode): array
+    public function updateAfterDeletingTaxon(TaxonInterface $taxon): array
     {
         $updatedPromotionCodes = [];
         $promotionRules = $this->promotionRuleRepository->findBy(['type' => HasTaxonRuleChecker::TYPE]);
 
         /** @var PromotionRuleInterface $promotionRule */
         foreach ($promotionRules as $promotionRule) {
             $configuration = $promotionRule->getConfiguration();
-            if (in_array($taxonCode, $configuration['taxons'])) {
-                $configuration['taxons'] = array_values(array_diff($configuration['taxons'], [$taxonCode]));
+            if (in_array($taxon->getCode(), $configuration['taxons'])) {
+                $configuration['taxons'] = array_values(array_diff($configuration['taxons'], [$taxon->getCode()]));
                 $promotionRule->setConfiguration($configuration);
 
                 $updatedPromotionCodes[] = $promotionRule->getPromotion()->getCode();

diff --git a/src/Sylius/Component/Core/Promotion/Updater/Rule/TaxonAwareRuleUpdaterInterface.php b/src/Sylius/Component/Core/Promotion/Updater/Rule/TaxonAwareRuleUpdaterInterface.php
@@ -13,7 +13,9 @@
 
 namespace Sylius\Component\Core\Promotion\Updater\Rule;
 
+use Sylius\Component\Core\Model\TaxonInterface;
+
 interface TaxonAwareRuleUpdaterInterface
 {
-    public function updateAfterDeletingTaxon(string $taxonCode): array;
+    public function updateAfterDeletingTaxon(TaxonInterface $taxon): array;
 }
diff --git a/src/Sylius/Component/Core/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdater.php b/src/Sylius/Component/Core/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdater.php
@@ -13,6 +13,7 @@
 
 namespace Sylius\Component\Core\Promotion\Updater\Rule;
 
+use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Core\Promotion\Checker\Rule\TotalOfItemsFromTaxonRuleChecker;
 use Sylius\Component\Promotion\Model\PromotionRuleInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
@@ -27,14 +28,14 @@ public function __construct(RepositoryInterface $promotionRuleRepository)
         $this->promotionRuleRepository = $promotionRuleRepository;
     }
 
-    public function updateAfterDeletingTaxon(string $taxonCode): array
+    public function updateAfterDeletingTaxon(TaxonInterface $taxon): array
     {
         $updatedPromotionCodes = [];
         $promotionRules = $this->promotionRuleRepository->findBy(['type' => TotalOfItemsFromTaxonRuleChecker::TYPE]);
 
         /** @var PromotionRuleInterface $promotionRule */
         foreach ($promotionRules as $promotionRule) {
-            $promotionCode = $this->removePromotionRuleIfNecessary($promotionRule, $taxonCode);
+            $promotionCode = $this->removePromotionRuleIfNecessary($promotionRule, $taxon->getCode());
 
             if (null !== $promotionCode) {
                 $updatedPromotionCodes[] = $promotionRule->getPromotion()->getCode();

diff --git a/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/HasTaxonRuleUpdaterSpec.php b/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/HasTaxonRuleUpdaterSpec.php
@@ -17,6 +17,7 @@
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Sylius\Component\Core\Model\PromotionInterface;
+use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Promotion\Model\PromotionRuleInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
@@ -32,8 +33,11 @@ function it_removes_deleted_taxon_from_rules_configurations(
         EntityManagerInterface $manager,
         PromotionRuleInterface $firstPromotionRule,
         PromotionRuleInterface $secondPromotionRule,
-        PromotionInterface $promotion
+        PromotionInterface $promotion,
+        TaxonInterface $taxon
     ): void {
+        $taxon->getCode()->willReturn('toys');
+
         $promotionRuleRepository
             ->findBy(['type' => 'has_taxon'])
             ->willReturn([$firstPromotionRule, $secondPromotionRule])
@@ -49,6 +53,6 @@ function it_removes_deleted_taxon_from_rules_configurations(
 
         $manager->flush()->shouldBeCalled();
 
-        $this->updateAfterDeletingTaxon('toys')->shouldReturn(['christmas']);
+        $this->updateAfterDeletingTaxon($taxon)->shouldReturn(['christmas']);
     }
 }
diff --git a/...ylius/Component/Core/spec/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdaterSpec.php b/...ylius/Component/Core/spec/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdaterSpec.php
@@ -15,6 +15,7 @@
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\PromotionInterface;
+use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Promotion\Model\PromotionRuleInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
@@ -29,8 +30,11 @@ function it_removes_rules_that_using_deleted_taxon(
         RepositoryInterface $promotionRuleRepository,
         PromotionRuleInterface $firstPromotionRule,
         PromotionRuleInterface $secondPromotionRule,
-        PromotionInterface $promotion
+        PromotionInterface $promotion,
+        TaxonInterface $taxon
     ): void {
+        $taxon->getCode()->willReturn('toys');
+
         $promotionRuleRepository
             ->findBy(['type' => 'total_of_items_from_taxon'])
             ->willReturn([$firstPromotionRule, $secondPromotionRule])
@@ -44,6 +48,6 @@ function it_removes_rules_that_using_deleted_taxon(
         $promotionRuleRepository->remove($firstPromotionRule)->shouldNotBeCalled();
         $promotionRuleRepository->remove($secondPromotionRule)->shouldBeCalled();
 
-        $this->updateAfterDeletingTaxon('toys')->shouldReturn(['christmas']);
+        $this->updateAfterDeletingTaxon($taxon)->shouldReturn(['christmas']);
     }
 }