Dx 206

.dev-tools/.php-cs-fixer.php

@@ -2,15 +2,11 @@
 
 require __DIR__.'/vendor/tpay-com/coding-standards/bootstrap.php';
 
-$config = Tpay\CodingStandards\PhpCsFixerConfigFactory::createWithLegacyRules()
+$config = Tpay\CodingStandards\PhpCsFixerConfigFactory::createWithNonRiskyRules()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->ignoreDotFiles(false)
             ->in(__DIR__.'/..')
     );
 
-$rules = $config->getRules();
-
-$rules['nullable_type_declaration_for_default_null_value'] = false;
-
-return $config->setRules($rules);
+return $config;

.dev-tools/composer.json

@@ -6,6 +6,7 @@
         "php-cs-fixer/shim": "^3.23",
         "phpstan/phpstan": "^1.10.30",
         "tpay-com/coding-standards": "^1.0.1",
+        "tpay-com/tpay-openapi-php": "^1.3",
         "tpay-com/tpay-php": "^2.3.4",
         "vimeo/psalm": "^5.15.0"
     },
@@ -15,12 +16,18 @@
             "url": "https://github.com/magento/magento2.git"
         }
     ],
+    "scripts": {
+        "cs:fixer": "./vendor/bin/php-cs-fixer fix -vvv --diff",
+        "cs:phpstan": "./vendor/bin/phpstan",
+        "cs:psalm": "./vendor/bin/psalm"
+    },
     "config": {
         "allow-plugins": {
             "ergebnis/composer-normalize": true,
             "kubawerlos/composer-smaller-lock": true,
             "magento/composer-dependency-version-audit-plugin": false,
-            "magento/magento-composer-installer": false
+            "magento/magento-composer-installer": false,
+            "php-http/discovery": false
         }
     }
 }

.dev-tools/phpstan.neon

@@ -3,10 +3,4 @@ parameters:
   paths:
     - ../
   excludePaths:
-    - ../Controller/tpay/Notification.php
     - ../vendor/
-  ignoreErrors:
-    - '#^Call to an undefined method tpaycom\\magento2basic\\Controller\\Tpaycom::getFormatAmount\(\)\.$#'
-    - '# invalid type Magento\\Sales\\Model\\OrderFactory\.$#'
-    - '# invalid type tpaycom\\magento2basic\\Model\\TransactionModelFactory\.$#'
-    - '# return statement is missing\.$#'

.github/workflows/ci.yaml

@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php-version: '7.0'
           - php-version: '7.1'
           - php-version: '7.2'
           - php-version: '7.3'

.github/workflows/sca.yaml

@@ -25,10 +25,10 @@ jobs:
         run: composer normalize --diff --dry-run --indent-size=4 --indent-style=space ../composer.json
 
       - working-directory: .dev-tools
-        run: ./vendor/bin/php-cs-fixer fix -vvv --diff --dry-run
+        run: composer cs:fixer -- --dry-run
 
       - working-directory: .dev-tools
-        run: ./vendor/bin/phpstan
+        run: composer cs:phpstan
 
       - working-directory: .dev-tools
-        run: ./vendor/bin/psalm --no-progress --shepherd
+        run: composer cs:psalm -- --no-progress --shepherd

Api/Sales/OrderRepositoryInterface.php

@@ -1,17 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace tpaycom\magento2basic\Api\Sales;
 
 use Magento\Sales\Api\OrderRepositoryInterface as MagentoOrderRepositoryInterface;
 
 interface OrderRepositoryInterface extends MagentoOrderRepositoryInterface
 {
-    /**
-     * Return new instance of Order by increment ID
-     *
-     * @param string $incrementId
-     *
-     * @return \Magento\Sales\Api\Data\OrderInterface
-     */
-    public function getByIncrementId($incrementId);
+    /** Return new instance of Order by increment ID */
+    public function getByIncrementId(string $incrementId): \Magento\Sales\Api\Data\OrderInterface;
 }

Api/TpayInterface.php

@@ -1,100 +1,99 @@
 <?php
 
+declare(strict_types=1);
+
 namespace tpaycom\magento2basic\Api;
 
 /**
  * @api
  */
 interface TpayInterface
 {
-    const CODE = 'tpaycom_magento2basic';
-    const CHANNEL = 'group';
-    const BLIK_CODE = 'blik_code';
-    const TERMS_ACCEPT = 'accept_tos';
-
-    /**
-     * Return string for redirection
-     *
-     * @return string
-     */
-    public function getRedirectURL();
-
-    /**
-     * Return data for form
-     *
-     * @param null|int $orderId
-     *
-     * @return array
-     */
-    public function getTpayFormData($orderId = null);
-
-    /** @return string */
-    public function getApiPassword();
-
-    /** @return string */
-    public function getApiKey();
-
-    /** @return string */
-    public function getSecurityCode();
-
-    /** @return int */
-    public function getMerchantId();
-
-    /**
-     * Check that the BLIK Level 0 should be active on a payment channels list
-     *
-     * @return bool
-     */
-    public function checkBlikLevel0Settings();
-
-    /** @return bool */
-    public function getBlikLevelZeroStatus();
-
-    /** @return bool */
-    public function onlyOnlineChannels();
-
-    /** @return bool */
-    public function redirectToChannel();
-
-    /**
-     * Return url to redirect after placed order
-     *
-     * @return string
-     */
-    public function getPaymentRedirectUrl();
-
-    /**
-     * Return url for a tpay.com terms
-     *
-     * @return string
-     */
-    public function getTermsURL();
-
-    /**
-     * Check if send an email about the new invoice to customer
-     *
-     * @return string
-     */
-    public function getInvoiceSendMail();
-
-    /**
-     * Check if Tpay notification server IP is forwarded by proxy
-     *
-     * @return bool
-     */
-    public function getCheckProxy();
-
-    /**
-     * Check Tpay notification server IP
-     *
-     * @return bool
-     */
-    public function getCheckTpayIP();
-
-    /**
-     * Check if checkout amount is in range of installments payment channel
-     *
-     * @return bool
-     */
-    public function getInstallmentsAmountValid();
+    public const CODE = 'tpaycom_magento2basic';
+    public const GROUP = 'group';
+    public const CHANNEL = 'channel';
+    public const BLIK_CODE = 'blik_code';
+    public const TERMS_ACCEPT = 'accept_tos';
+    public const CARDDATA = 'card_data';
+    public const CARD_SAVE = 'card_save';
+    public const CARD_ID = 'card_id';
+    public const CARD_VENDOR = 'card_vendor';
+    public const SHORT_CODE = 'short_code';
+
+    /** Return string for redirection */
+    public function getRedirectURL(): string;
+
+    /** Return data for form */
+    public function getTpayFormData(?string $orderId = null): array;
+
+    public function getCardTitle(): ?string;
+
+    public function isOriginApiEnabled(): bool;
+
+    public function isOpenApiEnabled(): bool;
+
+    public function isCardEnabled(): bool;
+
+    public function isOriginApiCardUse(): bool;
+
+    public function getApiPassword(): ?string;
+
+    public function getOpenApiPassword(): ?string;
+
+    public function getApiKey(): ?string;
+
+    public function getSecurityCode(?int $storeId = null): ?string;
+
+    public function getOpenApiClientId(): ?string;
+
+    public function getMerchantId(): ?int;
+
+    /** Check that the BLIK Level 0 should be active on a payment channels list */
+    public function checkBlikLevel0Settings(): bool;
+
+    public function getBlikLevelZeroStatus(): bool;
+
+    public function onlyOnlineChannels(): bool;
+
+    public function redirectToChannel(): bool;
+
+    /** Return url to redirect after placed order */
+    public function getPaymentRedirectUrl(): string;
+
+    /** Return url for a tpay.com terms */
+    public function getTermsURL(): string;
+
+    /** Check if send an email about the new invoice to customer */
+    public function getInvoiceSendMail(): string;
+
+    public function useSandboxMode(?int $storeId = null): bool;
+
+    /** Check if checkout amount is in range of installments payment channel */
+    public function getInstallmentsAmountValid(): bool;
+
+    public function getCardApiKey(): ?string;
+
+    public function getCardApiPassword(): ?string;
+
+    public function getCardSaveEnabled(): bool;
+
+    public function getCheckoutCustomerId(): ?string;
+
+    public function getRSAKey(): ?string;
+
+    public function isCustomerLoggedIn(): bool;
+
+    public function getHashType(): ?string;
+
+    public function getVerificationCode(): ?string;
+
+    public function isAllowSpecific(): bool;
+
+    public function getSpecificCountry(): array;
+
+    /** @param string $orderId */
+    public function getCustomerId($orderId);
+
+    /** @param string $orderId */
+    public function isCustomerGuest($orderId);
 }