[Maintenance] Add missing locale processor argument and cover pay form locale resolving

Author: NoResponseMate

src/Controller/PayWithPayPalFormAction.php

@@ -20,6 +20,7 @@
 use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
 use Sylius\PayPalPlugin\Api\CacheAuthorizeClientApiInterface;
 use Sylius\PayPalPlugin\Api\IdentityApiInterface;
+use Sylius\PayPalPlugin\Processor\LocaleProcessorInterface;
 use Sylius\PayPalPlugin\Provider\AvailableCountriesProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -43,12 +44,24 @@ public function __construct(
         AvailableCountriesProviderInterface $countriesProvider,
         CacheAuthorizeClientApiInterface $authorizeClientApi,
         IdentityApiInterface $identityApi,
+        private ?LocaleProcessorInterface $localeProcessor = null,
     ) {
         $this->twig = $twig;
         $this->paymentRepository = $paymentRepository;
         $this->countriesProvider = $countriesProvider;
         $this->authorizeClientApi = $authorizeClientApi;
         $this->identityApi = $identityApi;
+        $this->localeProcessor = $localeProcessor;
+
+        if (null === $localeProcessor) {
+            trigger_deprecation(
+                'SyliusPayPalPlugin',
+                '1.7',
+                'Not passing an instance of %s to %s constructor is deprecated and will be required in 3.0.',
+                LocaleProcessorInterface::class,
+                self::class
+            );
+        }
     }
 
     public function __invoke(Request $request): Response
@@ -73,14 +86,15 @@ public function __invoke(Request $request): Response
 
         $token = $this->authorizeClientApi->authorize($paymentMethod);
         $clientToken = $this->identityApi->generateToken($token);
+        $locale = $request->getLocale();
 
         return new Response($this->twig->render('@SyliusPayPalPlugin/payWithPaypal.html.twig', [
             'available_countries' => $this->countriesProvider->provide(),
             'billing_address' => $order->getBillingAddress(),
             'client_id' => $clientId,
             'client_token' => $clientToken,
             'currency' => $order->getCurrencyCode(),
-            'locale' => $request->getLocale(),
+            'locale' => null !== $this->localeProcessor ? $this->localeProcessor->process($locale) : $locale,
             'merchant_id' => $gatewayConfig->getConfig()['merchant_id'],
             'order_token' => $order->getTokenValue(),
             'partner_attribution_id' => $partnerAttributionId,

src/Resources/config/services.xml

@@ -189,7 +189,9 @@
         <service
             id="Sylius\PayPalPlugin\Processor\LocaleProcessorInterface"
             class="Sylius\PayPalPlugin\Processor\LocaleProcessor"
-        />
+        >
+            <argument type="service" id="sylius_paypal.resolver.supported_locale" />
+        </service>
         <service id="sylius_paypal.processor.locale" alias="Sylius\PayPalPlugin\Processor\LocaleProcessorInterface" />
 
         <service

src/Resources/config/services/controller.xml

@@ -132,6 +132,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.provider.paypal_configuration" />
         </service>
         <service id="sylius_paypal.controller.pay_with_paypal_form" alias="Sylius\PayPalPlugin\Controller\PayWithPayPalFormAction" />