[UPMERGE] 2.0 -> 2.1

.github/workflows/build.yaml

@@ -31,12 +31,12 @@ jobs:
                 database: ["mysql", "postgres"]
                 mysql: ["8.4"]
                 postgres: ["15.8"]
-                node: ["20.x"]
+                node: ["22.x"]
                 state_machine_adapter: ["symfony_workflow"]
 
                 include:
                     -   php: "8.3"
-                        symfony: "~7.2.0"
+                        symfony: "~7.3.0"
                         sylius: "~2.1.0"
                         node: "24.x"
                         database: "mysql"

composer.json

@@ -28,6 +28,7 @@
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
         "lchrusciel/api-test-case": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
         "nyholm/psr7": "^1.8",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-doctrine": "^2.0",

config/services.xml

@@ -20,12 +20,33 @@
         <import resource="services/**/*.xml" />
     </imports>
 
+    <parameters>
+        <parameter key="sylius_paypal.prioritize_paypal_as_default_method">true</parameter>
+
+        <parameter type="collection" key="sylius_paypal.repository.query.pay_pal_payment.updatable_states">
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_CART</parameter>
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</parameter>
+        </parameter>
+        <parameter type="collection" key="sylius_paypal.repository.query.pay_pal_payment.cancellable_states">
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_CART</parameter>
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</parameter>
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_PROCESSING</parameter>
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_AUTHORIZED</parameter>
+        </parameter>
+        <parameter type="collection" key="sylius_paypal.repository.query.pay_pal_payment.refundable_states">
+            <parameter type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_COMPLETED</parameter>
+        </parameter>
+    </parameters>
+
     <services>
         <service id="sylius_paypal.form.extension.payment_method" class="Sylius\PayPalPlugin\Form\Extension\PaymentMethodTypeExtension">
             <tag name="form.type_extension" />
         </service>
 
         <service id="sylius_paypal.form.type.paypal_configuration" class="Sylius\PayPalPlugin\Form\Type\PayPalConfigurationType">
+            <argument>%sylius_paypal.sandbox%</argument>
+
+            <tag name="form.type" />
             <tag name="sylius.gateway_configuration_type" type="sylius_paypal" label="sylius_paypal.label" />
         </service>
 
@@ -46,6 +67,7 @@
             <argument type="service" id="router" />
             <argument type="service" id="request_stack" />
             <argument type="service" id="sylius_paypal.provider.paypal_payment_method" />
+            <argument>%sylius_paypal.sandbox%</argument>
             <tag name="kernel.event_listener" event="sylius.payment_method.initialize_create" method="initializeCreate" />
         </service>
 
@@ -75,6 +97,7 @@
         >
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.repository.order" />
+            <deprecated package="sylius/paypal-plugin" version="1.7">The "%service_id%" service is deprecated since 1.7 and will be removed in 3.0.</deprecated>
         </service>
         <service id="Sylius\PayPalPlugin\Provider\PaymentProviderInterface" alias="sylius_paypal.provider.payment" />
 
@@ -157,7 +180,9 @@
         <service
             id="sylius_paypal.processor.locale"
             class="Sylius\PayPalPlugin\Processor\LocaleProcessor"
-        />
+        >
+            <argument type="service" id="sylius_paypal.resolver.supported_locale" />
+        </service>
         <service id="Sylius\PayPalPlugin\Processor\LocaleProcessorInterface" alias="sylius_paypal.processor.locale" />
 
         <service
@@ -188,6 +213,7 @@
         >
             <argument type="service" id=".inner" />
             <argument type="service" id="sylius.repository.payment_method" />
+            <argument>%sylius_paypal.prioritize_paypal_as_default_method%</argument>
         </service>
 
         <service
@@ -291,5 +317,30 @@
 
         <service id="sylius_paypal.verifier.payment_amount" class="Sylius\PayPalPlugin\Verifier\PaymentAmountVerifier" />
         <service id="Sylius\PayPalPlugin\Verifier\PaymentAmountVerifierInterface" alias="sylius_paypal.verifier.payment_amount" />
+
+        <service
+            id="sylius_paypal.repository.query.paypal_payment"
+            class="Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQuery"
+        >
+            <argument type="service" id="sylius.manager.payment" />
+            <argument type="service" id="sylius.repository.payment"/>
+            <argument>%sylius_paypal.repository.query.pay_pal_payment.updatable_states%</argument>
+            <argument>%sylius_paypal.repository.query.pay_pal_payment.cancellable_states%</argument>
+            <argument>%sylius_paypal.repository.query.pay_pal_payment.refundable_states%</argument>
+        </service>
+        <service id="Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface" alias="sylius_paypal.repository.query.paypal_payment" />
+
+        <service id="sylius_paypal.resolver.paypal_payment_methods" class="Sylius\PayPalPlugin\Resolver\PayPalPaymentMethodsResolver">
+            <argument type="service" id="sylius.repository.payment_method" />
+        </service>
+        <service id="Sylius\PayPalPlugin\Resolver\PayPalPaymentMethodsResolverInterface" alias="sylius_paypal.resolver.paypal_payment_methods" />
+
+        <service
+            id="sylius_paypal.resolver.supported_locale"
+            class="Sylius\PayPalPlugin\Resolver\SupportedLocaleResolver"
+        >
+            <argument>%sylius_paypal.supported_locales%</argument>
+        </service>
+        <service id="Sylius\PayPalPlugin\Resolver\SupportedLocaleResolverInterface" alias="sylius_paypal.resolver.supported_locale" />
     </services>
 </container>

config/services/controller.xml

@@ -24,11 +24,12 @@
             <argument type="service" id="sylius_paypal.provider.payment" />
             <argument type="service" id="sylius.manager.payment" />
             <argument type="service" id="sylius_paypal.provider.paypal_refund_data" />
+            <argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
         </service>
 
         <service id="sylius_paypal.controller.cancel_paypal_order" class="Sylius\PayPalPlugin\Controller\CancelPayPalOrderAction">
-            <argument type="service" id="sylius_paypal.provider.payment" />
-            <argument type="service" id="sylius.repository.order" />
+            <argument>null</argument>
+            <argument>null</argument>
             <argument type="service" id="request_stack" />
         </service>
 
@@ -38,6 +39,7 @@
             <argument type="service" id="request_stack" />
             <argument type="service" id="sylius_abstraction.state_machine" />
             <argument type="service" id="sylius.order_processing.order_payment_processor.checkout" />
+            <argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
         </service>
 
         <service id="sylius_paypal.controller.cancel_last_paypal_payment" class="Sylius\PayPalPlugin\Controller\CancelLastPayPalPaymentAction">
@@ -50,6 +52,7 @@
         <service id="sylius_paypal.controller.cancel_paypal_checkout_payment" class="Sylius\PayPalPlugin\Controller\CancelPayPalCheckoutPaymentAction">
             <argument type="service" id="sylius_paypal.provider.payment" />
             <argument type="service" id="sylius_paypal.manager.payment_state" />
+            <argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
         </service>
 
         <service id="sylius_paypal.controller.complete_paypal_order" class="Sylius\PayPalPlugin\Controller\CompletePayPalOrderAction">
@@ -89,6 +92,7 @@
             <argument type="service" id="sylius_paypal.resolver.capture_payment" />
             <argument type="service" id="sylius.remover.payment.order" />
             <argument type="service" id="sylius.order_processing.order_processor" />
+            <argument type="service" id="sylius_paypal.resolver.paypal_payment_methods" />
         </service>
 
         <service id="sylius_paypal.controller.paypal_buttons" class="Sylius\PayPalPlugin\Controller\PayPalButtonsController">
@@ -108,6 +112,7 @@
             <argument type="service" id="sylius_paypal.provider.available_countries" />
             <argument type="service" id="sylius_paypal.api.cache_authorize_client" />
             <argument type="service" id="sylius_paypal.api.identity" />
+            <argument type="service" id="sylius_paypal.processor.locale" />
         </service>
 
         <service id="sylius_paypal.controller.process_paypal_order" class="Sylius\PayPalPlugin\Controller\ProcessPayPalOrderAction">
@@ -129,6 +134,7 @@
             <argument type="service" id="sylius_paypal.api.update_order" />
             <argument type="service" id="sylius.factory.address" />
             <argument type="service" id="sylius.order_processing.order_processor" />
+            <argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
         </service>
 
         <service id="sylius_paypal.controller.complete_paypal_order_from_payment_page" class="Sylius\PayPalPlugin\Controller\CompletePayPalOrderFromPaymentPageAction">

ecs.php

@@ -11,7 +11,6 @@
 return static function (ECSConfig $config): void {
     $config->paths([
         'src',
-        'spec',
         'tests/Behat',
         'tests/Functional',
         'tests/Service',
@@ -37,7 +36,6 @@
     );
 
     $config->skip([
-        VisibilityRequiredFixer::class => ['*Spec.php'],
         InlineDocCommentDeclarationSniff::class . '.MissingVariable',
     ]);
 };

phpstan.neon.dist

@@ -3,18 +3,16 @@ includes:
     - vendor/phpstan/phpstan-webmozart-assert/extension.neon
 
 parameters:
-    level: 3
-
-    reportUnmatchedIgnoredErrors: false
+    level: 6
 
     paths:
-        - 'src/'
+        - src
 
     excludePaths:
         # Makes PHPStan crash
         - 'src/DependencyInjection/Configuration.php'
-        - 'src/DependencyInjection/SyliusPayPalExtension.php'
 
-        # Test dependencies
-        - 'tests/Application/app/**.php'
-        - 'tests/Application/src/**.php'
+    ignoreErrors:
+        - identifier: missingType.iterableValue
+
+        - '/Dead catch - Sylius\\PayPalPlugin\\Exception\\PayPalWebhookUrlNotValidException is never thrown in the try block\./' # architectural smell

src/Api/CacheAuthorizeClientApi.php

@@ -22,6 +22,7 @@
 
 final readonly class CacheAuthorizeClientApi implements CacheAuthorizeClientApiInterface
 {
+    /** @param ObjectRepository<PayPalCredentialsInterface> $payPalCredentialsRepository */
     public function __construct(
         private ObjectManager $payPalCredentialsManager,
         private ObjectRepository $payPalCredentialsRepository,
@@ -32,7 +33,6 @@ public function __construct(
 
     public function authorize(PaymentMethodInterface $paymentMethod): string
     {
-        /** @var PayPalCredentialsInterface|null $payPalCredentials */
         $payPalCredentials = $this->payPalCredentialsRepository->findOneBy(['paymentMethod' => $paymentMethod]);
         if ($payPalCredentials !== null && !$payPalCredentials->isExpired()) {
             return $payPalCredentials->accessToken();

src/Console/Command/CompletePaidPaymentsCommand.php

@@ -35,6 +35,7 @@
 )]
 final class CompletePaidPaymentsCommand extends Command
 {
+    /** @param PaymentRepositoryInterface<PaymentInterface> $paymentRepository */
     public function __construct(
         private readonly PaymentRepositoryInterface $paymentRepository,
         private readonly ObjectManager $paymentManager,

src/Controller/CancelLastPayPalPaymentAction.php

@@ -25,6 +25,7 @@
 
 final readonly class CancelLastPayPalPaymentAction
 {
+    /** @param OrderRepositoryInterface<OrderInterface> $orderRepository */
     public function __construct(
         private ObjectManager $objectManager,
         private StateMachineInterface $stateMachineFactory,
@@ -41,6 +42,10 @@ public function __invoke(Request $request): Response
         /** @var PaymentInterface $payment */
         $payment = $order->getLastPayment();
 
+        if (!$this->stateMachineFactory->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_CANCEL)) {
+            return new Response('', Response::HTTP_NO_CONTENT);
+        }
+
         $this->stateMachineFactory->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_CANCEL);
 
         /** @var PaymentInterface $lastPayment */

src/Controller/CancelPayPalCheckoutPaymentAction.php

@@ -15,28 +15,51 @@
 
 use Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface;
 use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
+use Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 
 final readonly class CancelPayPalCheckoutPaymentAction
 {
     public function __construct(
-        private PaymentProviderInterface $paymentProvider,
+        private ?PaymentProviderInterface $paymentProvider,
         private PaymentStateManagerInterface $paymentStateManager,
+        private ?PaypalPaymentQueryInterface $paypalPaymentQuery = null,
     ) {
+        if (null !== $this->paymentProvider) {
+            trigger_deprecation(
+                'sylius/paypal-plugin',
+                '1.7',
+                sprintf(
+                    'Passing an instance of "%s" as the first argument is deprecated and will be prohibited in 3.0',
+                    PaymentProviderInterface::class,
+                ),
+            );
+        }
+        if (null === $this->paypalPaymentQuery) {
+            trigger_deprecation(
+                'sylius/paypal-plugin',
+                '1.7',
+                sprintf(
+                    'Not passing an instance of "%s" is deprecated and will be prohibited in 3.0',
+                    PaypalPaymentQueryInterface::class,
+                ),
+            );
+        }
     }
 
     public function __invoke(Request $request): Response
     {
-        /**
-         * @var string $content
-         */
+        /** @var string $content */
         $content = $request->getContent();
-
         $content = (array) json_decode($content, true);
 
-        $payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
+        if (null !== $this->paypalPaymentQuery) {
+            $payment = $this->paypalPaymentQuery->getForCancellationByOrderId((string) $content['payPalOrderId']);
+        } else {
+            $payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
+        }
 
         /** @var FlashBagInterface $flashBag */
         $flashBag = $request->getSession()->getBag('flashes');

src/Controller/CancelPayPalOrderAction.php

@@ -23,29 +23,23 @@
 
 final readonly class CancelPayPalOrderAction
 {
+    /** @param OrderRepositoryInterface<OrderInterface>|null $orderRepository */
     public function __construct(
-        private PaymentProviderInterface $paymentProvider,
-        private OrderRepositoryInterface $orderRepository,
+        private ?PaymentProviderInterface $paymentProvider,
+        private ?OrderRepositoryInterface $orderRepository,
         private RequestStack $flashBagOrRequestStack,
     ) {
+        if (null !== $this->paymentProvider) {
+            trigger_deprecation('sylius/paypal-plugin', '1.7', sprintf('Passing an instance of %s as the first argument is deprecated and will be prohibited in 3.0', PaymentProviderInterface::class));
+        }
+        if (null !== $this->orderRepository) {
+            trigger_deprecation('sylius/paypal-plugin', '1.7', sprintf('Passing an instance of %s as the second argument is deprecated and will be prohibited in 3.0', OrderRepositoryInterface::class));
+        }
     }
 
     public function __invoke(Request $request): Response
     {
-        /**
-         * @var string $content
-         */
-        $content = $request->getContent();
-
-        $content = (array) json_decode($content, true);
-
-        $payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
-
-        /** @var OrderInterface $order */
-        $order = $payment->getOrder();
-        $this->orderRepository->remove($order);
-
-        FlashBagProvider::getFlashBag($this->flashBagOrRequestStack)->add('success', 'sylius_paypal.order_cancelled');
+        FlashBagProvider::getFlashBag($this->flashBagOrRequestStack)->add('success', 'sylius.pay_pal.order_cancelled');
 
         return new Response('', Response::HTTP_NO_CONTENT);
     }