rename classes

Sylius · May 21, 2021 · 97d40e7 · 97d40e7
1 parent 7a15180
commit 97d40e7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 38 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php b/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php
@@ -355,7 +355,6 @@ public function iProceededWithShippingMethod(ShippingMethodInterface $shippingMe
         $this->ordersClient->executeCustomRequest($request);
     }
 
-
     /**
      * @When I try to select :paymentMethodCode payment method
      */

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@@ -50,9 +50,9 @@
             <tag name="validator.constraint_validator" alias="sylius_api_order_payment_method_eligibility" />
         </service>
 
-        <service id="sylius.api.validator.choose_payment_method_eligibility" class="Sylius\Bundle\ApiBundle\Validator\Constraints\ChoosePaymentMethodEligibilityValidator">
+        <service id="sylius.api.validator.chosen_payment_method_eligibility" class="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentMethodEligibilityValidator">
             <argument type="service" id="sylius.repository.payment_method" />
-            <tag name="validator.constraint_validator" alias="sylius_api_choose_payment_method_eligibility" />
+            <tag name="validator.constraint_validator" alias="sylius_api_chosen_payment_method_eligibility" />
         </service>
 
         <service id="sylius.api.validator.correct_change_shop_user_confirm_password" class="Sylius\Bundle\ApiBundle\Validator\Constraints\CorrectChangeShopUserConfirmPasswordValidator">

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/ChoosePaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/ChoosePaymentMethod.xml
@@ -16,7 +16,7 @@
                     xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
 
     <class name="Sylius\Bundle\ApiBundle\Command\Checkout\ChoosePaymentMethod">
-        <constraint name="Sylius\Bundle\ApiBundle\Validator\Constraints\ChoosePaymentMethodEligibility">
+        <constraint name="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentMethodEligibility">
             <option name="groups">
                 <value>sylius</value>
             </option>

diff --git a/...raints/ChoosePaymentMethodEligibility.php → ...raints/ChosenPaymentMethodEligibility.php b/...raints/ChoosePaymentMethodEligibility.php → ...raints/ChosenPaymentMethodEligibility.php
@@ -15,10 +15,10 @@
 
 use Symfony\Component\Validator\Constraint;
 
-final class ChoosePaymentMethodEligibility extends Constraint
+final class ChosenPaymentMethodEligibility extends Constraint
 {
     /** @var string */
-    public $paymentMethodNotExistMessage = 'sylius.payment_method.not_exist';
+    public $message = 'sylius.payment_method.not_exist';
 
     public function validatedBy(): string
     {

diff --git a/...oosePaymentMethodEligibilityValidator.php → ...osenPaymentMethodEligibilityValidator.php b/...oosePaymentMethodEligibilityValidator.php → ...osenPaymentMethodEligibilityValidator.php
@@ -20,7 +20,7 @@
 use Webmozart\Assert\Assert;
 
 /** @experimental */
-final class ChoosePaymentMethodEligibilityValidator extends ConstraintValidator
+final class ChosenPaymentMethodEligibilityValidator extends ConstraintValidator
 {
     /** @var PaymentMethodRepositoryInterface */
     private $paymentMethodRepository;
@@ -33,14 +33,14 @@ public function validate($value, Constraint $constraint): void
     {
         Assert::isInstanceOf($value, PaymentMethodCodeAwareInterface::class);
 
-        /** @var ChoosePaymentMethodEligibility $constraint */
-        Assert::isInstanceOf($constraint, ChoosePaymentMethodEligibility::class);
+        /** @var ChosenPaymentMethodEligibility $constraint */
+        Assert::isInstanceOf($constraint, ChosenPaymentMethodEligibility::class);
 
         $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $value->getPaymentMethodCode()]);
 
         if ($paymentMethod === null) {
             $this->context->addViolation(
-                $constraint->paymentMethodNotExistMessage,
+                $constraint->message,
                 ['%paymentMethodCode%' => $value->getPaymentMethodCode()]
             );
 

diff --git a/...PaymentMethodEligibilityValidatorSpec.php → ...PaymentMethodEligibilityValidatorSpec.php b/...PaymentMethodEligibilityValidatorSpec.php → ...PaymentMethodEligibilityValidatorSpec.php
@@ -16,18 +16,22 @@
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\ApiBundle\Command\Checkout\ChoosePaymentMethod;
 use Sylius\Bundle\ApiBundle\Command\PaymentMethodCodeAwareInterface;
-use Sylius\Bundle\ApiBundle\Validator\Constraints\ChoosePaymentMethodEligibility;
+use Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentMethodEligibility;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-final class ChoosePaymentMethodEligibilityValidatorSpec extends ObjectBehavior
+final class ChosenPaymentMethodEligibilityValidatorSpec extends ObjectBehavior
 {
-    function let(PaymentMethodRepositoryInterface $paymentMethodRepository): void
-    {
+    function let(
+        PaymentMethodRepositoryInterface $paymentMethodRepository,
+        ExecutionContextInterface $executionContext
+    ): void {
         $this->beConstructedWith($paymentMethodRepository);
+
+        $this->initialize($executionContext);
     }
 
     function it_is_a_constraint_validator(): void
@@ -39,37 +43,21 @@ function it_throws_an_exception_if_value_does_not_extend_payment_method_code_awa
     {
         $this
             ->shouldThrow(\InvalidArgumentException::class)
-            ->during('validate', ['', new class() extends Constraint {
-            }]);
+            ->during('validate', ['', new ChosenPaymentMethodEligibility()]);
     }
 
-    function it_throws_an_exception_if_constraint_does_not_type_of_choose_payment_method_eligibility(): void
+    function it_throws_an_exception_if_constraint_is_not_an_instance_of_chosen_payment_method_eligibility(): void
     {
-        $constraint = new class() extends Constraint implements PaymentMethodCodeAwareInterface {
-            private $paymentMethodCode;
-
-            function getPaymentMethodCode(): ?string
-            {
-                return 'abc';
-            }
-
-            function setPaymentMethodCode(?string $paymentMethodCode): void
-            {
-                $this->paymentMethodCode = $paymentMethodCode;
-            }
-        };
-
         $this
             ->shouldThrow(\InvalidArgumentException::class)
-            ->during('validate', ['', $constraint]);
+            ->during('validate', [new ChoosePaymentMethod('code'), new class() extends Constraint {}])
+        ;
     }
 
     function it_adds_violation_if_payment_does_not_exist(
         PaymentMethodRepositoryInterface $paymentMethodRepository,
         ExecutionContextInterface $executionContext
     ): void {
-        $this->initialize($executionContext);
-
         $paymentMethodRepository->findOneBy(['code' => 'payment_method_code'])->willReturn(null);
 
         $executionContext
@@ -78,7 +66,7 @@ function it_adds_violation_if_payment_does_not_exist(
 
         $this->validate(
             new ChoosePaymentMethod('payment_method_code'),
-            new ChoosePaymentMethodEligibility()
+            new ChosenPaymentMethodEligibility()
         );
     }
 
@@ -87,8 +75,6 @@ function it_does_nothing_if_payment_method_is_eligible(
         PaymentMethodInterface $paymentMethod,
         ExecutionContextInterface $executionContext
     ): void {
-        $this->initialize($executionContext);
-
         $paymentMethodRepository->findOneBy(['code' => 'payment_method_code'])->willReturn($paymentMethod);
 
         $executionContext
@@ -97,7 +83,7 @@ function it_does_nothing_if_payment_method_is_eligible(
 
         $this->validate(
             new ChoosePaymentMethod('payment_method_code'),
-            new ChoosePaymentMethodEligibility()
+            new ChosenPaymentMethodEligibility()
         );
     }
 }