Resolve a code sniffer issues

AD4CR22I-9
Adyen · Jan 8, 2025 · 01eafec · 01eafec
1 parent 19f2b25
commit 01eafec
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 33 deletions.
diff --git a/src/Service/ExpressCheckoutService.php b/src/Service/ExpressCheckoutService.php
@@ -53,8 +53,7 @@ public function __construct(
         PaymentMethodsFilterService $paymentMethodsFilterService,
         Currency                    $currencyUtil,
         KernelInterface             $kernel
-    )
-    {
+    ) {
         $this->cartService = $cartService;
         $this->expressCheckoutRepository = $expressCheckoutRepository;
         $this->paymentMethodsFilterService = $paymentMethodsFilterService;
@@ -94,7 +93,14 @@ public function getExpressCheckoutConfigOnProductPage(
         string $formattedHandlerIdentifier = ''
     ): array {
         // Creating new cart
-        $cartData = $this->createCart($productId, $quantity, $salesChannelContext, $newAddress, $newShipping, $formattedHandlerIdentifier);
+        $cartData = $this->createCart(
+            $productId,
+            $quantity,
+            $salesChannelContext,
+            $newAddress,
+            $newShipping,
+            $formattedHandlerIdentifier
+        );
 
         $cart = $cartData['cart'];
 
@@ -176,7 +182,8 @@ public function createCart(
         $paymentMethod = $salesChannelContext->getPaymentMethod();
         if ($formattedHandlerIdentifier !== '') {
             // Express checkout payment method
-            $paymentMethod = $this->paymentMethodsFilterService->getPaymentMethodByFormattedHandler($formattedHandlerIdentifier, $salesChannelContext->getContext());
+            $paymentMethod = $this->paymentMethodsFilterService
+                ->getPaymentMethodByFormattedHandler($formattedHandlerIdentifier, $salesChannelContext->getContext());
         }
 
         // Resolving shipping location
@@ -200,8 +207,20 @@ public function createCart(
 
         // Recreate context with selected shipping method
         $updatedSalesChannelContext = $this->isVersion64
-            ? $this->createContextFor64($salesChannelContext, $token, $shippingLocation, $paymentMethod, $shippingMethod)
-            : $this->createContextFor65($salesChannelContext, $token, $shippingLocation, $paymentMethod, $shippingMethod);
+            ? $this->createContextFor64(
+                $salesChannelContext,
+                $token,
+                $shippingLocation,
+                $paymentMethod,
+                $shippingMethod
+            )
+            : $this->createContextFor65(
+                $salesChannelContext,
+                $token,
+                $shippingLocation,
+                $paymentMethod,
+                $shippingMethod
+            );
 
         // Recalculate the cart
         $cart = $this->cartService->recalculate($cart, $updatedSalesChannelContext);
@@ -232,8 +251,7 @@ private function resolveShippingMethod(
         SalesChannelContext $salesChannelContext,
         Cart                $cart,
         array               $newShipping
-    ): ShippingMethodEntity
-    {
+    ): ShippingMethodEntity {
         // Fetch available shipping methods
         $filteredMethods = $this->expressCheckoutRepository->fetchAvailableShippingMethods($salesChannelContext, $cart);
 
@@ -269,8 +287,7 @@ private function createContextFor64(
         ShippingLocation $shippingLocation,
         PaymentMethodEntity $paymentMethod,
         ?ShippingMethodEntity $shippingMethod = null
-    ): SalesChannelContext
-    {
+    ): SalesChannelContext {
         return new SalesChannelContext(
             $salesChannelContext->getContext(),
             $token,
@@ -306,8 +323,7 @@ private function createContextFor65(
         ShippingLocation $shippingLocation,
         PaymentMethodEntity $paymentMethod,
         ?ShippingMethodEntity $shippingMethod = null
-    ): SalesChannelContext
-    {
+    ): SalesChannelContext {
         return new SalesChannelContext(
             $salesChannelContext->getContext(),
             $token,

diff --git a/src/Service/PaymentMethodsFilterService.php b/src/Service/PaymentMethodsFilterService.php
@@ -94,9 +94,8 @@ public function __construct(
         ExpressCheckoutRepository  $expressCheckoutRepository,
         Currency                   $currency,
         AbstractPaymentMethodRoute $paymentMethodRoute,
-                                   $paymentMethodRepository
-    )
-    {
+        $paymentMethodRepository
+    ) {
         $this->configurationService = $configurationService;
         $this->paymentMethodsService = $paymentMethodsService;
         $this->paymentMethodRoute = $paymentMethodRoute;
@@ -342,8 +341,7 @@ public function getGiftCardPaymentMethodId(SalesChannelContext $context): ?strin
     public function getAvailableExpressCheckoutPaymentMethods(
         Cart                $cart,
         SalesChannelContext $salesChannelContext
-    ): PaymentMethodsResponse
-    {
+    ): PaymentMethodsResponse {
         $googlePayAvailable = $this->configurationService->isGooglePayExpressCheckoutEnabled();
         $payPalAvailable = $this->configurationService->isPayPalExpressCheckoutEnabled();
         $applePayAvailable = $this->configurationService->isApplePayExpressCheckoutEnabled();
@@ -367,7 +365,8 @@ public function getAvailableExpressCheckoutPaymentMethods(
             ->getElements();
 
         foreach ($salesChannelPaymentMethodEntities as $paymentMethodEntity) {
-            if ( $paymentMethodEntity->getFormattedHandlerIdentifier() === 'handler_adyen_googlepaypaymentmethodhandler') {
+            if ($paymentMethodEntity->getFormattedHandlerIdentifier()
+                === 'handler_adyen_googlepaypaymentmethodhandler') {
                 $googlePayInSalesChannel = true;
                 continue;
             }
@@ -377,7 +376,8 @@ public function getAvailableExpressCheckoutPaymentMethods(
                 continue;
             }
 
-            if ($paymentMethodEntity->getFormattedHandlerIdentifier() === 'handler_adyen_applepaypaymentmethodhandler') {
+            if ($paymentMethodEntity->getFormattedHandlerIdentifier()
+                === 'handler_adyen_applepaypaymentmethodhandler') {
                 $applePayInSalesChannel = true;
             }
         }
@@ -433,8 +433,10 @@ public function getAvailableExpressCheckoutPaymentMethods(
      * @param Context $context
      * @return PaymentMethodEntity|null
      */
-    public function getPaymentMethodByFormattedHandler(string $formattedHandlerIdentifier, Context $context): ?PaymentMethodEntity
-    {
+    public function getPaymentMethodByFormattedHandler(
+        string $formattedHandlerIdentifier,
+        Context $context
+    ): ?PaymentMethodEntity {
         $criteria = new Criteria();
 
         // Fetch all payment methods
@@ -461,8 +463,7 @@ public function getPaymentMethodByFormattedHandler(string $formattedHandlerIdent
     private function getSalesChannelPaymentMethodEntitiesFilteredByRules(
         Cart $cart,
         SalesChannelContext $salesChannelContext
-    ): PaymentMethodCollection
-    {
+    ): PaymentMethodCollection {
         $salesChannelPaymentMethodIs = $salesChannelContext->getSalesChannel()
             ->getPaymentMethodIds();
         $criteria = new Criteria();
@@ -473,7 +474,10 @@ private function getSalesChannelPaymentMethodEntitiesFilteredByRules(
         $paymentMethods = $this->paymentMethodRepository->search($criteria, $salesChannelContext->getContext())
             ->getEntities();
 
-        return $paymentMethods->filter(function (PaymentMethodEntity $paymentMethodEntity) use ($cart, $salesChannelContext) {
+        return $paymentMethods->filter(function (PaymentMethodEntity $paymentMethodEntity) use (
+            $cart,
+            $salesChannelContext
+        ) {
             $availabilityRule = $paymentMethodEntity->getAvailabilityRule();
             if (!$availabilityRule) {
                 return true; // No rule means it's always available

diff --git a/src/Service/PaymentMethodsService.php b/src/Service/PaymentMethodsService.php
@@ -120,8 +120,7 @@ public function getPaymentMethods(
         SalesChannelContext $context,
         string $orderId = '',
         int $amount = 0
-    ): PaymentMethodsResponse
-    {
+    ): PaymentMethodsResponse {
         $requestData = $this->buildPaymentMethodsRequestData($context, $orderId, $amount);
 
         $paymentRequestString = json_encode($requestData);
@@ -212,8 +211,7 @@ private function buildPaymentMethodsRequestData(
         SalesChannelContext $context,
         string $orderId = '',
         int $amount = 0
-    ): array
-    {
+    ): array {
         $merchantAccount = $this->configurationService->getMerchantAccount($context->getSalesChannel()->getId());
 
         if (!$merchantAccount) {
@@ -225,7 +223,7 @@ private function buildPaymentMethodsRequestData(
         // Retrieve data from cart if no order is created yet
         if ($orderId === '') {
             $currency = $context->getCurrency()->getIsoCode();
-            if ($amount === 0){
+            if ($amount === 0) {
                 $cart = $this->cartService->getCart($context->getToken(), $context);
                 $amount = $this->currency->sanitize($cart->getPrice()->getTotalPrice(), $currency);
             }

diff --git a/src/Service/Repository/ExpressCheckoutRepository.php b/src/Service/Repository/ExpressCheckoutRepository.php
@@ -30,8 +30,7 @@ class ExpressCheckoutRepository
     public function __construct(
         EntityRepository $shippingMethodRepository,
         EntityRepository $countryRepository
-    )
-    {
+    ) {
         $this->shippingMethodRepository = $shippingMethodRepository;
         $this->countryRepository = $countryRepository;
     }
@@ -120,5 +119,4 @@ public function resolveCountry(SalesChannelContext $salesChannelContext, array $
 
         return $country;
     }
-
-}
+}