From 97d40e75286e7a84c252d0fd478101768f6a62d8 Mon Sep 17 00:00:00 2001 From: arti0090 Date: Fri, 21 May 2021 13:15:34 +0200 Subject: [PATCH] rename classes --- .../Context/Api/Shop/CheckoutContext.php | 1 - .../Resources/config/services/validator.xml | 4 +- .../config/validation/ChoosePaymentMethod.xml | 2 +- ...php => ChosenPaymentMethodEligibility.php} | 4 +- ...osenPaymentMethodEligibilityValidator.php} | 8 ++-- ...PaymentMethodEligibilityValidatorSpec.php} | 42 +++++++------------ 6 files changed, 23 insertions(+), 38 deletions(-) rename src/Sylius/Bundle/ApiBundle/Validator/Constraints/{ChoosePaymentMethodEligibility.php => ChosenPaymentMethodEligibility.php} (80%) rename src/Sylius/Bundle/ApiBundle/Validator/Constraints/{ChoosePaymentMethodEligibilityValidator.php => ChosenPaymentMethodEligibilityValidator.php} (84%) rename src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/{ChoosePaymentMethodEligibilityValidatorSpec.php => ChosenPaymentMethodEligibilityValidatorSpec.php} (70%) diff --git a/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php b/src/Sylius/Behat/Context/Api/Shop/CheckoutContext.php index 9efa69c3f209..937ffb315025 100644 --- 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 index 4d16b044e08d..5b2aa9824f25 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml @@ -50,9 +50,9 @@ - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/ChoosePaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/ChoosePaymentMethod.xml index c1fbff137207..2c7a9850765c 100644 --- 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"> - + diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php similarity index 80% rename from src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibility.php rename to src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php index e089d42a8083..c3f8aa62f46d 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/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/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibilityValidator.php similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibilityValidator.php rename to src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibilityValidator.php index 5a055f15625a..e0d3e7a0ec71 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChoosePaymentMethodEligibilityValidator.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibilityValidator.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/src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChoosePaymentMethodEligibilityValidatorSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChosenPaymentMethodEligibilityValidatorSpec.php similarity index 70% rename from src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChoosePaymentMethodEligibilityValidatorSpec.php rename to src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChosenPaymentMethodEligibilityValidatorSpec.php index c15bea6ffe73..d8c690b6e538 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChoosePaymentMethodEligibilityValidatorSpec.php +++ b/src/Sylius/Bundle/ApiBundle/spec/Validator/Constraints/ChosenPaymentMethodEligibilityValidatorSpec.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() ); } }