Correct the parameter name for states that should be cancelled, when …

…payment method is changed
TheMilek · Oct 7, 2024 · 3992383 · 3992383
1 parent 247437e
commit 3992383
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -60,7 +60,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('payment_request')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->arrayNode('states_that_should_be_cancelled_when_payment_request_has_changed')
+                        ->arrayNode('states_to_be_cancelled_when_payment_method_changed')
                             ->scalarPrototype()->end()
                         ->end()
                     ->end()

diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
@@ -34,7 +34,7 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $container->setParameter('sylius.payment_gateways', $config['gateways']);
         $container->setParameter('sylius.gateway_config.validation_groups', $config['gateway_config']['validation_groups']);
-        $container->setParameter('sylius.payment_request.states_that_should_be_cancelled_when_payment_request_has_changed', $config['payment_request']['states_that_should_be_cancelled_when_payment_request_has_changed']);
+        $container->setParameter('sylius.payment_request.states_to_be_cancelled_when_payment_method_changed', $config['payment_request']['states_to_be_cancelled_when_payment_method_changed']);
 
         $this->registerAutoconfiguration($container);
     }

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -13,6 +13,6 @@ jms_serializer:
 
 sylius_payment:
     payment_request:
-        states_that_should_be_cancelled_when_payment_request_has_changed:
+        states_to_be_cancelled_when_payment_method_changed:
             - !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_PROCESSING
             - !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_NEW
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/canceller.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/canceller.xml
@@ -21,7 +21,7 @@
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius_abstraction.state_machine" />
             <argument type="service" id="doctrine.orm.entity_manager" />
-            <argument>%sylius.payment_request.states_that_should_be_cancelled_when_payment_request_has_changed%</argument>
+            <argument>%sylius.payment_request.states_to_be_cancelled_when_payment_method_changed%</argument>
         </service>
         <service id="Sylius\Component\Payment\Canceller\PaymentRequestCancellerInterface" alias="sylius.canceller.payment_request" />
     </services>

diff --git a/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
@@ -87,15 +87,15 @@ public function it_loads_parameter_with_payment_request_states_that_should_be_ca
     {
         $this->load([
             'payment_request' => [
-                'states_that_should_be_cancelled_when_payment_request_has_changed' => [
+                'states_to_be_cancelled_when_payment_method_changed' => [
                     PaymentRequestInterface::STATE_NEW,
                     PaymentRequestInterface::STATE_PROCESSING,
                 ],
             ],
         ]);
 
         $this->assertContainerBuilderHasParameter(
-            'sylius.payment_request.states_that_should_be_cancelled_when_payment_request_has_changed',
+            'sylius.payment_request.states_to_be_cancelled_when_payment_method_changed',
             [PaymentRequestInterface::STATE_NEW, PaymentRequestInterface::STATE_PROCESSING],
         );
     }

diff --git a/src/Sylius/Bundle/PaymentBundle/Tests/EventListener/PaymentMethodChangeEventListenerTest.php b/src/Sylius/Bundle/PaymentBundle/Tests/EventListener/PaymentMethodChangeEventListenerTest.php
@@ -34,9 +34,7 @@ public function it_updates_payment_request_when_the_payment_has_changed_payment_
         $entityManager = $this->createMock(EntityManagerInterface::class);
         $unitOfWork = $this->createMock(UnitOfWork::class);
 
-        $payment->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+        $payment->expects($this->once())->method('getId')->willReturn(1);
 
         $newMethod->expects($this->once())
             ->method('getCode')

diff --git a/src/Sylius/Bundle/PaymentBundle/spec/Canceller/PaymentRequestCancellerSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Canceller/PaymentRequestCancellerSpec.php
@@ -37,8 +37,10 @@ function it_cancels_payment_requests_if_the_payment_method_code_is_different(
         StateMachineInterface $stateMachine,
         ObjectManager $objectManager,
     ): void {
-        $paymentRequestRepository->findByPaymentIdAndStates(1, [PaymentRequestInterface::STATE_NEW, PaymentRequestInterface::STATE_PROCESSING])
-            ->willReturn([$paymentRequest1, $paymentRequest2]);
+        $paymentRequestRepository
+            ->findByPaymentIdAndStates(1, [PaymentRequestInterface::STATE_NEW, PaymentRequestInterface::STATE_PROCESSING])
+            ->willReturn([$paymentRequest1, $paymentRequest2])
+        ;
 
         $paymentRequest1->getMethod()->willReturn($paymentMethod1);
         $paymentMethod1->getCode()->willReturn('payment_method_with_different_code');