Fixing PHP sniffer and SonarQube issues

Adyen · Nov 28, 2024 · 95b557e · 95b557e
1 parent 6ba3b97
commit 95b557e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/src/AdyenPaymentShopware6.php b/src/AdyenPaymentShopware6.php
@@ -49,6 +49,8 @@
 
 class AdyenPaymentShopware6 extends Plugin
 {
+    public const SOFORT = 'Adyen\Shopware\Handlers\SofortPaymentMethodHandler';
+
     public function installJsAssets($shopwareVersion)
     {
         $storefrontAssetPath = __DIR__ . '/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js';
@@ -203,8 +205,9 @@ private function addPaymentMethod(PaymentMethods\PaymentMethodInterface $payment
         $paymentRepository = $this->container->get('payment_method.repository');
 
         // Rename if Klarna Debit Risk doesnt exist from previous installations
-        if ($paymentMethod->getPaymentHandler() === KlarnaDebitRiskPaymentMethodHandler::class && $paymentMethodId === null) {
-            $sofortMethodId = $this->getPaymentMethodId('Adyen\Shopware\Handlers\SofortPaymentMethodHandler');
+        if ($paymentMethod->getPaymentHandler() === KlarnaDebitRiskPaymentMethodHandler::class
+            && $paymentMethodId === null) {
+            $sofortMethodId = $this->getPaymentMethodId(self::SOFORT);
 
             if ($sofortMethodId) {
                 // update Sofort to Klarna Debit Risk
@@ -585,17 +588,22 @@ private function updateTo3170(UpdateContext $updateContext): void
 
         // Version 3.17.0 replaces Sofort with Klarna Debit Risk
         $paymentRepository = $this->container->get('payment_method.repository');
-        $paymentMethodId = $this->getPaymentMethodId('Adyen\Shopware\Handlers\SofortPaymentMethodHandler');
-        $klarnaDebitRisktMethodId = $this->getPaymentMethodId('Adyen\Shopware\Handlers\KlarnaDebitRiskPaymentMethodHandler');
+        $paymentMethodId = $this->getPaymentMethodId(self::SOFORT);
+        $klarnaDebitRisktMethodId = $this->getPaymentMethodId(
+            'Adyen\Shopware\Handlers\KlarnaDebitRiskPaymentMethodHandler'
+        );
 
         // If Sofort does not exist, return
         if (!$paymentMethodId) {
             return;
         }
 
-        if($klarnaDebitRisktMethodId !== null) {
+        if ($klarnaDebitRisktMethodId !== null) {
             // Klarna Debit Risk exists, deactivate Sofort and skip renaming
-            $this->deactivateAndRemovePaymentMethod($updateContext, 'Adyen\Shopware\Handlers\SofortPaymentMethodHandler');
+            $this->deactivateAndRemovePaymentMethod(
+                $updateContext,
+                self::SOFORT
+            );
 
             return;
         }
@@ -680,4 +688,4 @@ private function deactivateAndRemovePaymentMethod(
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     require_once __DIR__ . '/../vendor/autoload.php';
-}
+}
diff --git a/src/Handlers/AbstractPaymentMethodHandler.php b/src/Handlers/AbstractPaymentMethodHandler.php
@@ -602,9 +602,9 @@ protected function preparePaymentsRequest(
         $paymentRequest->setMerchantAccount(
             $this->configurationService->getMerchantAccount($salesChannelContext->getSalesChannel()->getId())
         );
-        if($paymentMethodType === 'bcmc_mobile'){
+        if ($paymentMethodType === 'bcmc_mobile') {
             $paymentRequest->setReturnUrl($this->getReturnUrl($transaction));
-        }else{
+        } else {
             $paymentRequest->setReturnUrl($transaction->getReturnUrl());
         }
 

diff --git a/src/PaymentMethods/OnlineBankingFinlandPaymentMethod.php b/src/PaymentMethods/OnlineBankingFinlandPaymentMethod.php
@@ -45,7 +45,7 @@ public function getName(): string
      */
     public function getDescription(): string
     {
-        return 'Online Banking Finland';
+        return 'Online Banking Finland payment method';
     }
 
     /**
@@ -97,4 +97,4 @@ public function getType(): string
     {
         return 'redirect';
     }
-}
+}
diff --git a/src/PaymentMethods/OnlineBankingPolandPaymentMethod.php b/src/PaymentMethods/OnlineBankingPolandPaymentMethod.php
@@ -45,7 +45,7 @@ public function getName(): string
      */
     public function getDescription(): string
     {
-        return 'Online Banking Poland';
+        return 'Online Banking Poland payment method';
     }
 
     /**
@@ -97,4 +97,4 @@ public function getType(): string
     {
         return 'redirect';
     }
-}
+}
diff --git a/src/Subscriber/PaymentSubscriber.php b/src/Subscriber/PaymentSubscriber.php
@@ -216,8 +216,7 @@ public function onShoppingCartLoaded(PageLoadedEvent $event)
         /** @var CheckoutCartPage|OffcanvasCartPage $page */
         $page = $event->getPage();
         $errorCodes = [];
-        if (
-            $event->getRequest()->get('errorCode')
+        if ($event->getRequest()->get('errorCode')
             && $event->getRequest()->get('errorCode') === 'UNSUCCESSFUL_ADYEN_TRANSACTION'
         ) {
             $errorCodes['errorCode'] = 'UNSUCCESSFUL_ADYEN_TRANSACTION';

diff --git a/src/Util/ShopwarePaymentTokenValidator.php b/src/Util/ShopwarePaymentTokenValidator.php
@@ -15,7 +15,8 @@ class ShopwarePaymentTokenValidator
     /**
      * @param TokenFactoryInterfaceV2 $tokenFactory
      */
-    public function __construct(TokenFactoryInterfaceV2 $tokenFactory){
+    public function __construct(TokenFactoryInterfaceV2 $tokenFactory)
+    {
         $this->tokenFactory = $tokenFactory;
     }
 
@@ -40,4 +41,4 @@ public function validateToken(?string $paymentToken): bool
             return false;
         }
     }
-}
+}