PHPMD, PHPStan, CodeStyle

OXID-eSales · Sep 20, 2024 · d454fd6 · d454fd6
1 parent 732b3bf
commit d454fd6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
@@ -10,6 +10,8 @@
 namespace OxidSolutionCatalysts\Adyen\Controller;
 
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\Eshop\Application\Controller\PaymentController;
+use OxidSolutionCatalysts\Adyen\Model\Payment;
 use OxidSolutionCatalysts\Adyen\Service\TranslationMapper;
 use OxidSolutionCatalysts\Adyen\Service\OrderReturnService;
 use OxidSolutionCatalysts\Adyen\Traits\ServiceContainer;
@@ -56,8 +58,10 @@ public function return(): ?string
      */
     public function execute()
     {
-        if ($this->getPayment()->isAdyenCreditCardPayment()) {
-            $paymentController = oxNew(\OxidEsales\Eshop\Application\Controller\PaymentController::class);
+        /** @var Payment $payment */
+        $payment = $this->getPayment();
+        if ($payment->isAdyenCreditCardPayment()) {
+            $paymentController = oxNew(PaymentController::class);
 
             if ($paymentController->validatePayment() !== "order") {
                 Registry::getUtils()->redirect(Registry::getConfig()->getShopHomeUrl() . 'cl=payment');
@@ -66,5 +70,4 @@ public function execute()
 
         return parent::execute();
     }
-
 }
diff --git a/src/Controller/PaymentController.php b/src/Controller/PaymentController.php
@@ -139,7 +139,8 @@ public function validatePayment()
         $newPaymentId       = $this->getStringRequestData('paymentid');
         $pspReference       = $session->getPspReference();
 
-        //if the payment is adyen credit card, it will be validated from the order step where a new paymentId is impossible
+        // if the payment is adyen credit card, it will be validated
+        // from the order step where a new paymentId is impossible
         $isAdyenCreditCard  = $this->getAdyenPaymentConfigService()->isAdyenCreditCardPayment($actualPaymentId);
         $paymentChanged     = !$isAdyenCreditCard && ($actualPaymentId !== $newPaymentId);
 

diff --git a/src/Core/ViewConfig.php b/src/Core/ViewConfig.php
@@ -211,11 +211,6 @@ public function getAdyenErrorInvalidSession(): string
         return Module::ADYEN_ERROR_INVALIDSESSION_NAME;
     }
 
-    public function getAdyenCreditCardTooltipText(): string
-    {
-        return Registry::getLang()->translateString("OSC_ADYEN_ORDER_TOOLTIP");
-    }
-
     /**
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface

diff --git a/src/Model/Payment.php b/src/Model/Payment.php
@@ -34,7 +34,7 @@ public function isAdyenPayment(): bool
     /**
      * Checks if the payment method is an Adyen credit card payment method
      */
-    public function isAdyenCreditCardPayment() :bool
+    public function isAdyenCreditCardPayment(): bool
     {
         return $this->getAdyenPaymentConfigService()->isAdyenCreditCardPayment($this->getId());
     }

diff --git a/src/Service/Module.php b/src/Service/Module.php
@@ -11,7 +11,7 @@ public function isAdyenPayment(string $paymentId): bool
         return (isset(ModuleCore::PAYMENT_DEFINTIONS[$paymentId]));
     }
 
-    public function isAdyenCreditCardPayment(string $paymentId) :bool
+    public function isAdyenCreditCardPayment(string $paymentId): bool
     {
         return $paymentId === ModuleCore::PAYMENT_CREDITCARD_ID;
     }

diff --git a/src/Service/PaymentConfigService.php b/src/Service/PaymentConfigService.php
@@ -37,7 +37,7 @@ public function isAdyenPayment(string $paymentId): bool
     /**
      * Checks if the payment method is an Adyen credit card payment method
      */
-    public function isAdyenCreditCardPayment(string $paymentId) : bool
+    public function isAdyenCreditCardPayment(string $paymentId): bool
     {
         return $this->moduleService->isAdyenCreditCardPayment($paymentId);
     }

diff --git a/views/frontend/tpl/payment/adyen_assets.tpl b/views/frontend/tpl/payment/adyen_assets.tpl
@@ -86,7 +86,7 @@
             [{elseif $isOrderPage}]
                 [{if $orderPaymentCreditCard}]
                     orderSubmitButton.disabled = true;
-                    orderSubmitButton.title = '[{$oViewConf->getAdyenCreditCardTooltipText()}]';
+                    orderSubmitButton.title = '[{assign var="template_title" value="OSC_ADYEN_ORDER_TOOLTIP"|oxmultilangassign}]';
                     const cardComponent = checkout.create(
                         'card',
                         {