cs fixes applied

Invertus · Nov 23, 2023 · 8ddbccd · 8ddbccd
1 parent d5b4988
commit 8ddbccd
Show file tree

Hide file tree

Showing 46 changed files with 66 additions and 95 deletions.
diff --git a/controllers/admin/AdminSaferPayOfficialPaymentController.php b/controllers/admin/AdminSaferPayOfficialPaymentController.php
@@ -272,7 +272,7 @@ protected function initForm()
         foreach ($paymentMethods as $paymentMethod) {
             $fields[] = [
                 'type' => 'free',
-                'label' => $saferPayPaymentNotation->getForDisplay($paymentMethod) ,
+                'label' => $saferPayPaymentNotation->getForDisplay($paymentMethod),
                 'name' => $paymentMethod,
                 'form_group_class' => 'saferpay-group',
             ];

diff --git a/controllers/front/hostedIframe.php b/controllers/front/hostedIframe.php
@@ -46,7 +46,7 @@ public function initContent()
             'credit_card_front_url' => "{$this->module->getPathUri()}views/img/example-card/credit-card-front.png",
             'credit_card_back_url' => "{$this->module->getPathUri()}views/img/example-card/credit-card-back.png",
             'tos_cms' => SaferPayConfig::isVersionAbove177() ? $this->getDefaultTermsAndConditions() : null,
-            'saferpay_selected_card' => $selectedCard
+            'saferpay_selected_card' => $selectedCard,
         ]);
 
         if (SaferPayConfig::isVersion17()) {

diff --git a/controllers/front/pendingNotify.php b/controllers/front/pendingNotify.php
@@ -99,7 +99,7 @@ private function handleCapturedRefund($orderRefundId)
 
         $order = new Order($orderRefund->id_order);
 
-        if ((int)$orderAssert->refunded_amount === (int)$orderAssert->amount) {
+        if ((int) $orderAssert->refunded_amount === (int) $orderAssert->amount) {
             $saferPayOrder = new SaferPayOrder($orderRefund->id_saferpay_order);
             $saferPayOrder->refunded = 1;
             $saferPayOrder->save();

diff --git a/controllers/front/return.php b/controllers/front/return.php
@@ -79,7 +79,6 @@ public function postProcess()
                 ],
                 true
             ));
-
         } catch (Exception $e) {
             PrestaShopLogger::addLog(
                 sprintf(

diff --git a/controllers/front/successIFrame.php b/controllers/front/successIFrame.php
@@ -22,7 +22,6 @@
  */
 
 use Invertus\SaferPay\Api\Enum\TransactionStatus;
-use Invertus\SaferPay\Api\Request\AuthorizationService;
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\Controller\AbstractSaferPayController;
 use Invertus\SaferPay\Enum\ControllerName;

diff --git a/saferpayofficial.php b/saferpayofficial.php
@@ -231,7 +231,7 @@ public function hookPaymentOptions($params)
             $inputs['type'] = [
                 'name' => 'saferpayPaymentType',
                 'type' => 'hidden',
-                'value' => $paymentTypeProvider->get($paymentMethod['paymentMethod'])
+                'value' => $paymentTypeProvider->get($paymentMethod['paymentMethod']),
             ];
 
             $newOption->setModuleName($this->name)
@@ -458,7 +458,7 @@ public function hookDisplayPayment($params)
                     'redirect' => $paymentRedirectionProvider->provideRedirectionLinkByPaymentMethod($paymentMethod['paymentMethod']),
                     'imgUrl' => $imageUrl,
                     'method' => $paymentMethod['paymentMethod'],
-                    'saferpayPaymentType' => $paymentTypeProvider->get($paymentMethod['paymentMethod'])
+                    'saferpayPaymentType' => $paymentTypeProvider->get($paymentMethod['paymentMethod']),
                 ]
             );
 
@@ -571,7 +571,7 @@ public function hookActionOrderStatusUpdate($params = [])
         $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
 
         if ($canSendOrderConfirmationEmail->verify($order, (int) $orderStatus->id)) {
-            $mailService->sendOrderConfMail($order, (int)$orderStatus->id);
+            $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
         }
     }
 
@@ -652,8 +652,8 @@ private function displayInAdminOrderPage(array $params)
             );
         } else {
             $action = $this->context->link->getAdminLink(
-                    self::ADMIN_ORDER_CONTROLLER
-                ) . '&id_order=' . (int) $orderId;
+                self::ADMIN_ORDER_CONTROLLER
+            ) . '&id_order=' . (int) $orderId;
         }
 
 

diff --git a/src/Api/ApiRequest.php b/src/Api/ApiRequest.php
@@ -106,7 +106,7 @@ private function getHeaders()
             'Content-Type' => 'application/json',
             'Saferpay-ApiVersion' => SaferPayConfig::API_VERSION,
             'Saferpay-RequestId' => 'false',
-            'Authorization' => "Basic $credentials"
+            'Authorization' => "Basic $credentials",
         ];
     }
 
@@ -117,9 +117,8 @@ private function getBaseUrl()
 
     private function isValidResponse(Response $response)
     {
-        if ($response->code >= 300){
+        if ($response->code >= 300) {
             throw new SaferPayApiException(sprintf('Initialize API failed: %s', $response->raw_body), SaferPayApiException::INITIALIZE);
         }
     }
 }
-
diff --git a/src/Api/Enum/TransactionStatus.php b/src/Api/Enum/TransactionStatus.php
@@ -33,4 +33,4 @@ class TransactionStatus
     const CANCELED = 'CANCELED';
     const CAPTURED = 'CAPTURED';
     const PENDING = 'PENDING';
-}
+}
diff --git a/src/Api/Request/AssertRefundService.php b/src/Api/Request/AssertRefundService.php
@@ -25,16 +25,10 @@
 
 use Exception;
 use Invertus\SaferPay\Api\ApiRequest;
-use Invertus\SaferPay\DTO\Request\Assert\AssertRequest;
 use Invertus\SaferPay\DTO\Request\AssertRefund\AssertRefundRequest;
-use Invertus\SaferPay\DTO\Response\Assert\AssertBody;
-use Invertus\SaferPay\DTO\Response\AssertRefund\AssertRefundBody;
-use Invertus\SaferPay\EntityBuilder\SaferPayAssertBuilder;
 use Invertus\SaferPay\EntityBuilder\SaferPayAssertRefundBuilder;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
 use Invertus\SaferPay\Service\Response\AssertRefundResponseObjectCreator;
-use Invertus\SaferPay\Service\Response\AssertResponseObjectCreator;
-use SaferPayOrder;
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/src/Api/Request/CancelService.php b/src/Api/Request/CancelService.php
@@ -52,7 +52,7 @@ public function cancel(CancelRequest $cancelRequest)
     {
         return $this->apiRequest->post(
             self::CANCEL_API,
-             $cancelRequest->getAsArray()
+            $cancelRequest->getAsArray()
         );
     }
 }
diff --git a/src/Api/Request/RefundService.php b/src/Api/Request/RefundService.php
@@ -52,7 +52,7 @@ public function refund(RefundRequest $refundRequest)
     {
         return $this->apiRequest->post(
             self::REFUND_API,
-             $refundRequest->getAsArray()
+            $refundRequest->getAsArray()
         );
     }
 }
diff --git a/src/Config/SaferPayConfig.php b/src/Config/SaferPayConfig.php
@@ -138,7 +138,7 @@ class SaferPayConfig
         'Postcard' => self::PAYMENT_POSTCARD,
         'BonusCard' => self::PAYMENT_BONUS,
         'Lastschrift' => self::PAYMENT_LASTSCHRIFT,
-        'SOFORTUEBERWEISUNG' => self::PAYMENT_SOFORT
+        'SOFORTUEBERWEISUNG' => self::PAYMENT_SOFORT,
     ];
 
     const FIELD_SUPPORTED_PAYMENT_METHODS = [

diff --git a/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php b/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php
@@ -60,4 +60,4 @@ private function isOrderStatusValid($orderStatusId)
 
         return false;
     }
-}
+}
diff --git a/src/DTO/Request/AssertRefund/AssertRefundRequest.php b/src/DTO/Request/AssertRefund/AssertRefundRequest.php
@@ -61,8 +61,8 @@ public function getAsArray()
                 'ClientInfo' => $this->requestHeader->getClientInfo(),
             ],
             'TransactionReference' => [
-                'TransactionId' => $this->transactionId
-            ]
+                'TransactionId' => $this->transactionId,
+            ],
         ];
 
         return $return;

diff --git a/src/DTO/Request/Capture/CaptureRequest.php b/src/DTO/Request/Capture/CaptureRequest.php
@@ -73,7 +73,7 @@ public function getAsArray()
             ],
             'TransactionReference' => [
                 'TransactionId' => $this->transactionId,
-            ]
+            ],
         ];
 
         return $return;

diff --git a/src/DTO/Request/Initialize/InitializeRequest.php b/src/DTO/Request/Initialize/InitializeRequest.php
@@ -123,21 +123,21 @@ class InitializeRequest
 
     public function __construct(
         RequestHeader        $requestHeader,
-                             $terminalId,
-                             $paymentMethod,
+        $terminalId,
+        $paymentMethod,
         Payment              $payment,
         Payer                $payer,
         ReturnUrl            $returnUrl,
-                             $notification,
+        $notification,
         DeliveryAddressForm  $deliveryAddressForm,
-                             $configSet,
-                             $cssUrl,
+        $configSet,
+        $cssUrl,
         Address              $deliveryAddress,
         Address              $billingAddress,
-                             $alias,
+        $alias,
         Order                $order,
         PayerProfile         $payerProfile,
-                             $fieldToken
+        $fieldToken
     ) {
         $this->requestHeader = $requestHeader;
         $this->terminalId = $terminalId;

diff --git a/src/DTO/Request/ObtainPaymentMethods/ObtainPaymentMethodsRequest.php b/src/DTO/Request/ObtainPaymentMethods/ObtainPaymentMethodsRequest.php
@@ -23,7 +23,6 @@
 
 namespace Invertus\SaferPay\DTO\Request\ObtainPaymentMethods;
 
-use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\DTO\Request\RequestHeader;
 
 if (!defined('_PS_VERSION_')) {

diff --git a/src/DTO/Request/Refund/RefundRequest.php b/src/DTO/Request/Refund/RefundRequest.php
@@ -23,7 +23,6 @@
 
 namespace Invertus\SaferPay\DTO\Request\Refund;
 
-use Invertus\SaferPay\Api\Request\RefundService;
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\DTO\Request\Payment;
 use Invertus\SaferPay\DTO\Request\PendingNotification;
@@ -73,7 +72,7 @@ public function getAsArray()
     {
         $return = [
             'RequestHeader' => [
-                'SpecVersion' => (string)Configuration::get(RequestHeader::SPEC_REFUND_VERSION),
+                'SpecVersion' => (string) Configuration::get(RequestHeader::SPEC_REFUND_VERSION),
                 'CustomerId' => $this->requestHeader->getCustomerId(),
                 'RequestId' => $this->requestHeader->getRequestId(),
                 'RetryIndicator' => $this->requestHeader->getRetryIndicator(),
@@ -86,7 +85,7 @@ public function getAsArray()
                 ],
                 'OrderId' => $this->payment->getOrderReference(), //for delay testing: NotifyRefund_DelayedResponse60
                 'RestrictRefundAmountToCapturedAmount' =>
-                    (bool)Configuration::get(SaferPayConfig::RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT),
+                    (bool) Configuration::get(SaferPayConfig::RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT),
             ],
             'CaptureReference' => [
                 'CaptureId' => $this->transactionId,

diff --git a/src/DTO/Response/AssertRefund/AssertRefundBody.php b/src/DTO/Response/AssertRefund/AssertRefundBody.php
@@ -23,14 +23,7 @@
 
 namespace Invertus\SaferPay\DTO\Response\AssertRefund;
 
-use Invertus\SaferPay\DTO\Response\Dcc;
-use Invertus\SaferPay\DTO\Response\Liability;
-use Invertus\SaferPay\DTO\Response\Payer;
-use Invertus\SaferPay\DTO\Response\PaymentMeans;
-use Invertus\SaferPay\DTO\Response\RegistrationResult;
 use Invertus\SaferPay\DTO\Response\ResponseHeader;
-use Invertus\SaferPay\DTO\Response\ThreeDs;
-use Invertus\SaferPay\DTO\Response\Transaction;
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/src/Enum/ControllerName.php b/src/Enum/ControllerName.php
@@ -44,4 +44,4 @@ class ControllerName
     const SUCCESS_IFRAME = 'successIframe';
     const VALIDATION = 'validation';
     const RETURN_URL = 'return';
-}
+}
diff --git a/src/Enum/PaymentType.php b/src/Enum/PaymentType.php
@@ -32,4 +32,4 @@ class PaymentType
     const BASIC = 'basic';
     const IFRAME = 'iframe';
     const HOSTED_IFRAME = 'hosted_iframe';
-}
+}
diff --git a/src/Factory/ModuleFactory.php b/src/Factory/ModuleFactory.php
@@ -39,4 +39,4 @@ public function getModule()
     {
         return Module::getInstanceByName('saferpayofficial');
     }
-}
+}
diff --git a/src/Install/Installer.php b/src/Install/Installer.php
@@ -27,9 +27,6 @@
 use Context;
 use Db;
 use Invertus\SaferPay\Config\SaferPayConfig;
-use Invertus\SaferPay\Service\SaferPayLogoCreator;
-use Invertus\SaferPay\Service\SaferPayPaymentCreator;
-use Invertus\SaferPay\Service\SaferPayRestrictionCreator;
 use Language;
 use OrderState;
 use Tab;

diff --git a/src/Install/Uninstaller.php b/src/Install/Uninstaller.php
@@ -24,7 +24,6 @@
 namespace Invertus\SaferPay\Install;
 
 use Configuration;
-use Db;
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Tab;
 
@@ -52,7 +51,7 @@ public function uninstall()
 
         foreach ($this->getCommands() as $tableName => $command) {
             if (false === \Db::getInstance()->execute($command)) {
-                $this->errors[] = sprintf($this->module->l('Failed to uninstall database table [%s]' , __CLASS__), $tableName);
+                $this->errors[] = sprintf($this->module->l('Failed to uninstall database table [%s]', __CLASS__), $tableName);
                 return false;
             }
         }

diff --git a/src/Presentation/Loader/PaymentFormAssetLoader.php b/src/Presentation/Loader/PaymentFormAssetLoader.php
@@ -60,7 +60,7 @@ public function register($controller)
                 'hosted_iframe' => PaymentType::HOSTED_IFRAME,
                 'iframe' => PaymentType::IFRAME,
                 'basic' => PaymentType::BASIC,
-            ]
+            ],
         ]);
 
         if (method_exists($controller, 'registerJavascript')) {
@@ -89,4 +89,4 @@ public function register($controller)
             }
         }
     }
-}
+}
diff --git a/src/Provider/PaymentRedirectionProvider.php b/src/Provider/PaymentRedirectionProvider.php
@@ -23,14 +23,10 @@
 
 namespace Invertus\SaferPay\Provider;
 
-use Configuration;
-use Context;
 use Invertus\SaferPay\Adapter\LegacyContext;
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\Enum\ControllerName;
 use Invertus\SaferPay\Enum\PaymentType;
-use Invertus\SaferPay\Factory\ModuleFactory;
-use Invertus\SaferPay\Repository\SaferPayFieldRepository;
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/src/Provider/PaymentRestrictionProvider.php b/src/Provider/PaymentRestrictionProvider.php
@@ -49,13 +49,11 @@ class PaymentRestrictionProvider implements PaymentRestrictionProviderInterface
      */
     private $klarnaPaymentRestrictionValidation;
 
-    public function __construct
-    (
+    public function __construct(
         ApplePayPaymentRestrictionValidation $applePayPaymentRestrictionValidation,
         BasePaymentRestrictionValidation $basePaymentRestrictionValidation,
         KlarnaPaymentRestrictionValidation $klarnaPaymentRestrictionValidation
-    )
-    {
+    ) {
         $this->applePayPaymentRestrictionValidation = $applePayPaymentRestrictionValidation;
         $this->basePaymentRestrictionValidation = $basePaymentRestrictionValidation;
         $this->klarnaPaymentRestrictionValidation = $klarnaPaymentRestrictionValidation;
@@ -69,7 +67,7 @@ public function getPaymentValidators()
         return [
             $this->applePayPaymentRestrictionValidation,
             $this->basePaymentRestrictionValidation,
-            $this->klarnaPaymentRestrictionValidation
+            $this->klarnaPaymentRestrictionValidation,
         ];
     }
 }
diff --git a/src/Provider/PaymentTypeProvider.php b/src/Provider/PaymentTypeProvider.php
@@ -95,4 +95,4 @@ private function isHostedIframeRedirect($paymentMethod)
 
         return true;
     }
-}
+}
diff --git a/src/Repository/SaferPayFieldRepository.php b/src/Repository/SaferPayFieldRepository.php
@@ -54,7 +54,7 @@ public function getIdByName($paymentName)
 
     public function truncateTable()
     {
-        $query = 'TRUNCATE TABLE '. _DB_PREFIX_ .'saferpay_field;';
+        $query = 'TRUNCATE TABLE ' . _DB_PREFIX_ . 'saferpay_field;';
 
         return Db::getInstance()->execute($query);
     }

diff --git a/src/Repository/SaferPayPaymentRepository.php b/src/Repository/SaferPayPaymentRepository.php
@@ -74,7 +74,7 @@ public function getActivePaymentMethods()
 
     public function truncateTable()
     {
-        $query = 'TRUNCATE TABLE '. _DB_PREFIX_ .'saferpay_payment;';
+        $query = 'TRUNCATE TABLE ' . _DB_PREFIX_ . 'saferpay_payment;';
 
         return Db::getInstance()->execute($query);
     }

diff --git a/src/Service/PaymentRestrictionValidation/BasePaymentRestrictionValidation.php b/src/Service/PaymentRestrictionValidation/BasePaymentRestrictionValidation.php
@@ -23,7 +23,6 @@
 
 namespace Invertus\SaferPay\Service\PaymentRestrictionValidation;
 
-use Currency;
 use Invertus\SaferPay\Adapter\LegacyContext;
 use Invertus\SaferPay\Repository\SaferPayPaymentRepository;
 use Invertus\SaferPay\Repository\SaferPayRestrictionRepository;
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,6 @@ public function postProcess() @@
                     ],
                     true
                 ));
             } catch (Exception $e) {
                 PrestaShopLogger::addLog(
                     sprintf(
@@ Expand Down @@