Support for Prestashop 9 (#43)

KamilBalwierz · web-flow · commit bffb32edb6e1 · 2025-07-16T08:31:26.000+02:00
Fixed

- Support for Prestashop 9.0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,10 +14,6 @@ jobs:
           - php-version: '7.2'
           - php-version: '7.3'
           - php-version: '7.4'
-          - php-version: '8.0'
-          - php-version: '8.1'
-          - php-version: '8.2'
-          - php-version: '8.3'
     runs-on: ubuntu-latest
 
     steps:
@@ -44,4 +40,4 @@ jobs:
         run: composer require php-parallel-lint/php-parallel-lint
 
       - working-directory: dev-tools
-        run: ./vendor/bin/parallel-lint ..
+        run: ./vendor/bin/parallel-lint --exclude ../src/Util/Logger/PsrLoggerV3.php ..
diff --git a/.github/workflows/ci8.yaml b/.github/workflows/ci8.yaml
@@ -0,0 +1,43 @@
+name: Continuous integration
+
+on:
+  push:
+
+jobs:
+  check:
+    name: PHP ${{ matrix.php-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php-version: '8.0'
+          - php-version: '8.1'
+          - php-version: '8.2'
+          - php-version: '8.3'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: none, curl, json, mbstring
+          coverage: none
+
+      - id: composer-cache
+        shell: bash
+        run: echo "dir=$(composer config cache-dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+
+      - run: mkdir dev-tools
+
+      - working-directory: dev-tools
+        run: composer require php-parallel-lint/php-parallel-lint
+
+      - working-directory: dev-tools
+        run: ./vendor/bin/parallel-lint ..
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.10.6]
+
+### Fixed
+
+- Support for Prestashop 9.0
+
 ## [1.10.5]
 
 ### Added
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>tpay</name>
     <displayName><![CDATA[Tpay]]></displayName>
-    <version><![CDATA[1.8.0]]></version>
+    <version><![CDATA[1.10.6]]></version>
     <description><![CDATA[Accepting online payments]]></description>
     <author><![CDATA[Krajowy Integrator Płatności S.A.]]></author>
     <tab><![CDATA[payments_gateways]]></tab>
diff --git a/config/common.yml b/config/common.yml
@@ -61,7 +61,6 @@ services:
   tpay.services.auto_cancel:
     class: Tpay\Service\AutoCancelService
     public: true
-    lazy: true
     arguments:
       - "@tpay.repository.transaction"
       - "@tpay"
diff --git a/config/config.yml b/config/config.yml
@@ -4,6 +4,6 @@ doctrine:
             TpayPaymentModule:
                 type: annotation
                 is_bundle: false
-                dir: "%kernel.root_dir%/../modules/tpay/src/Entity"
+                dir: "%kernel.project_dir%/modules/tpay/src/Entity"
                 prefix: Tpay\Entity
                 alias: Tpay
diff --git a/config_pl.xml b/config_pl.xml
@@ -2,7 +2,7 @@
 <module>
     <name>tpay</name>
     <displayName><![CDATA[Tpay]]></displayName>
-    <version><![CDATA[1.10.4]]></version>
+    <version><![CDATA[1.10.6]]></version>
     <description><![CDATA[Przyjmowanie płatności online]]></description>
     <author><![CDATA[Krajowy Integrator Płatności S.A.]]></author>
     <tab><![CDATA[payments_gateways]]></tab>
diff --git a/controllers/front/ajax.php b/controllers/front/ajax.php
@@ -129,7 +129,7 @@ public function renderFragment($tpayPayment): void
     {
         ob_end_clean();
         header('Content-Type: application/json');
-        $this->ajaxDie(
+        $this->ajaxRender(
             json_encode(
                 [
                     'cart_summary_subtotals_container' => $this->render('checkout/_partials/cart-summary-subtotals'),
diff --git a/controllers/front/chargeBlik.php b/controllers/front/chargeBlik.php
@@ -97,7 +97,7 @@ public function blik0Status($transactionId)
     {
         $result = $this->waitForBlikAccept($transactionId, 0);
 
-        $this->ajaxDie(
+        $this->ajaxRender(
             json_encode([
                 'status' => $result['status'],
                 'result' => $result
@@ -141,7 +141,7 @@ public function createTransaction($address, $customer, $context, $cart, $order)
             $this->createTransactionInDb($transaction, $order->id, false);
         }
 
-        $this->ajaxDie(
+        $this->ajaxRender(
             json_encode([
                 'status' => $transaction['status'],
                 'backUrl' => $this->module->getContext()->link->getModuleLink(
@@ -175,7 +175,7 @@ public function payBlikTransaction($transactionId)
             $result['status'] = 'error';
         }
 
-        $this->ajaxDie(
+        $this->ajaxRender(
             json_encode([
                 'result' => $result['status'],
             ])
@@ -364,7 +364,7 @@ private function payByTransfer($address, $customer, $context, $cart, $order, str
         $transaction = $this->module->api->transactions()->createTransaction($transactionParams);
 
         if (!isset($transaction['transactionPaymentUrl'])) {
-            $this->ajaxDie(
+            $this->ajaxRender(
                 json_encode([
                     'status' => 'error'
                 ])
@@ -379,7 +379,7 @@ private function payByTransfer($address, $customer, $context, $cart, $order, str
             $this->updateTransactionInDb($transaction, $order->id, $oldTransactionId, 'transfer');
         }
 
-        $this->ajaxDie(
+        $this->ajaxRender(
             json_encode([
                 'status' => 'correct',
                 'payment_url' => $transaction['transactionPaymentUrl']
diff --git a/controllers/front/savedCards.php b/controllers/front/savedCards.php
@@ -65,6 +65,6 @@ public function displayAjaxDeleteCard()
             (int) $this->context->customer->id
         );
 
-        $this->ajaxDie(json_encode(['results' => $delete ? 'error' : 'success']));
+        $this->ajaxRender(json_encode(['results' => $delete ? 'error' : 'success']));
     }
 }
diff --git a/src/Handler/CreditCardPaymentHandler.php b/src/Handler/CreditCardPaymentHandler.php
@@ -237,7 +237,7 @@ private function makeCardPayment($transaction)
     {
         $cardDataInput = filter_input(INPUT_POST, 'carddata', FILTER_SANITIZE_STRING);
         $cardHashInput = filter_input(INPUT_POST, 'card_hash', FILTER_SANITIZE_STRING);
-        $cartHash = $this->module->getService('tpay.util.secret_hash');
+        $cartHash = $this->module->getService('tpay.util.secret_hash')->getValue();
 
         $cardHash = SHA1($cardHashInput . $cartHash);
         $saveCard = false;
diff --git a/src/Handler/RepositoryQueryHandler.php b/src/Handler/RepositoryQueryHandler.php
@@ -28,34 +28,52 @@ class RepositoryQueryHandler
      * @param string $errorPrefix
      * @param string $type
      *
-     * @throws RepositoryException
-     * @throws BaseException
      * @return Statement|int
+     * @throws BaseException
+     * @throws RepositoryException
      */
     public function execute(QueryBuilder $qb, string $errorPrefix = 'SQL error', string $type = '')
     {
         try {
-            switch ($type) {
-                case 'fetchColumn':
-                    $statement = $qb->execute()->fetchColumn();
-                    break;
-                case 'fetchAll':
-                    $statement = $qb->execute()->fetchAll();
-                    break;
-                case 'fetch':
-                    $statement = $qb->execute()->fetch();
-                    break;
-                default:
-                    $statement = $qb->execute();
+            if (method_exists($qb, 'executeQuery')) {
+                switch ($type) {
+                    case 'fetchColumn':
+                        $statement = $qb->executeQuery()->fetchOne();
+                        break;
+                    case 'fetchAll':
+                        $statement = $qb->executeQuery()->fetchAllAssociative();
+                        break;
+                    case 'fetch':
+                        $statement = $qb->executeQuery()->fetchAssociative();
+                        break;
+                    default:
+                        $statement = $qb->executeStatement();
+                }
+            } else {
+                switch ($type) {
+                    case 'fetchColumn':
+                        $statement = $qb->execute()->fetchColumn();
+                        break;
+                    case 'fetchAll':
+                        $statement = $qb->execute()->fetchAll();
+                        break;
+                    case 'fetch':
+                        $statement = $qb->execute()->fetch();
+                        break;
+                    default:
+                        $statement = $qb->execute();
+                }
             }
         } catch (\Exception $exception) {
             \PrestaShopLogger::addLog($exception->getMessage(), 3);
             throw new BaseException($exception->getMessage());
         }
 
-        if ($statement instanceof Statement && !empty($statement->errorInfo())) {
-            \PrestaShopLogger::addLog($errorPrefix, 3);
-            throw new RepositoryException($errorPrefix . ': ' . var_export($statement->errorInfo(), true));
+        if (method_exists(Statement::class, 'errorInfo')) {
+            if ($statement instanceof Statement && !empty($statement->errorInfo())) {
+                \PrestaShopLogger::addLog($errorPrefix, 3);
+                throw new RepositoryException($errorPrefix . ': ' . var_export($statement->errorInfo(), true));
+            }
         }
 
         return $statement;
diff --git a/src/Hook/EmailOrder.php b/src/Hook/EmailOrder.php
@@ -16,6 +16,7 @@
 
 namespace Tpay\Hook;
 
+use Context;
 use Exception;
 use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
 use Tools;
@@ -59,7 +60,10 @@ public function actionEmailAddAfterContent($params)
         if ($emailHeader) {
             $total = $cart->getOrderTotal();
             $total += $this->getSurchargeCost();
-            $total = Tools::displayPrice($total, $this->context->currency);
+            $total = Context::getContext()->getCurrentLocale()->formatPrice(
+                $total,
+                $this->context->currency->iso_code
+            );
 
             $emailFooter = str_replace("{total_paid}", $total, (string)$emailFooter);
             $params['template_html'] = $emailHeader . $this->renderExtraChargeDataInMail(
@@ -77,7 +81,10 @@ private function renderExtraChargeDataInMail($surchargeCost): string
         }
 
         $this->context->smarty->assign([
-            'surchargeCost' => Tools::displayPrice($surchargeCost, $this->context->currency)
+            'surchargeCost' => Context::getContext()->getCurrentLocale()->formatPrice(
+                $surchargeCost,
+                $this->context->currency->iso_code
+            )
         ]);
 
         return $this->module->fetch('module:tpay/views/templates/hook/emailSurcharge.tpl');
@@ -119,9 +126,9 @@ public function displayPDFInvoice($params): string
 
         if ($surchargeValue > 0.00) {
             $this->context->smarty->assign([
-                'surchargeCost' => Tools::displayPrice(
+                'surchargeCost' => Context::getContext()->getCurrentLocale()->formatPrice(
                     $surchargeValue,
-                    $this->context->currency
+                    $this->context->currency->iso_code
                 )
             ]);
 
diff --git a/src/Util/Container.php b/src/Util/Container.php
@@ -2,7 +2,7 @@
 
 namespace Tpay\Util;
 
-use Symfony\Component\HttpKernel\KernelInterface;
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use Tpay\Entity\TpayRefund;
 
 final class Container
@@ -19,14 +19,11 @@ public static function getInstance()
     {
         if (null === self::$instance) {
             if (false === self::isContainerBuiltWithModules()) {
-                $kernel = new \Tpay\Util\LegacyAppKernel(_PS_MODE_DEV_ ? 'dev' : 'prod', _PS_MODE_DEV_);
+                $kernel = new LegacyAppKernel(_PS_MODE_DEV_ ? 'dev' : 'prod', _PS_MODE_DEV_);
                 $kernel->boot();
-            } else {
-                global $kernel;
-            }
-
-            if ($kernel instanceof KernelInterface) {
                 self::$instance = $kernel->getContainer();
+            } else {
+                self::$instance = SymfonyContainer::getInstance();
             }
         }
 
@@ -35,15 +32,15 @@ public static function getInstance()
 
     private static function isContainerBuiltWithModules()
     {
-        global $kernel;
+        $container = SymfonyContainer::getInstance();
         try {
-            if (null !== $kernel) {
+            if (null !== $container) {
                 //just try to fetch random Tpay service
                 //if exception occures - it means that container is built with only core presta modules (v 1.7.3 and lower)
-                $kernel->getContainer()->get('tpay.service.surcharge');
+                $container->get('tpay.service.surcharge');
 
                 //if exception <<class>> was not found in the chain configured namespaces occur, we should instantiate legacy container
-                $kernel->getContainer()->get('doctrine')->getRepository(TpayRefund::class);
+                $container->get('doctrine')->getRepository(TpayRefund::class);
                 return true;
             }
         } catch (\Exception $e) {
diff --git a/src/Util/LegacyAppKernel.php b/src/Util/LegacyAppKernel.php
@@ -12,12 +12,14 @@
 
 class LegacyAppKernel extends \AppKernel
 {
+    protected $name = 'tpay';
+
     public function getRootDir()
     {
         return _PS_ROOT_DIR_ . '/app';
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         if (_PS_CACHE_DIR_) {
             return _PS_CACHE_DIR_;
@@ -26,7 +28,7 @@ public function getCacheDir()
         return _PS_ROOT_DIR_ . '/app/cache/' . $this->getEnvironment();
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return _PS_ROOT_DIR_ . '/app/logs';
     }
@@ -38,9 +40,13 @@ public function registerContainerConfiguration(\Symfony\Component\Config\Loader\
         $loader->load(__DIR__ . '/../../config/config.yml');
     }
 
-    protected function getContainerClass()
+    protected function getContainerClass(): string
     {
         return 'legacy' . ucfirst($this->name) . ucfirst($this->environment) . ($this->debug ? 'Debug' : '') . 'ProjectContainer';
     }
 
+    public function getAppId(): string
+    {
+        return 'front';
+    }
 }
diff --git a/src/Util/Logger/PsrLoggerV1.php b/src/Util/Logger/PsrLoggerV1.php
diff --git a/src/Util/Logger/PsrLoggerV3.php b/src/Util/Logger/PsrLoggerV3.php
diff --git a/src/Util/PsrLogger.php b/src/Util/PsrLogger.php
diff --git a/src/Util/SecretHash.php b/src/Util/SecretHash.php
diff --git a/tpay.php b/tpay.php
diff --git a/views/templates/hook/thank_you_page.tpl b/views/templates/hook/thank_you_page.tpl

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function renderFragment($tpayPayment): void`
`129`	`129`	`{`
`130`	`130`	`ob_end_clean();`
`131`	`131`	`header('Content-Type: application/json');`
`132`		`- $this->ajaxDie(`
	`132`	`+ $this->ajaxRender(`
`133`	`133`	`json_encode(`
`134`	`134`	`[`
`135`	`135`	`'cart_summary_subtotals_container' => $this->render('checkout/_partials/cart-summary-subtotals'),`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,6 @@ public function displayAjaxDeleteCard()`
`65`	`65`	`(int) $this->context->customer->id`
`66`	`66`	`);`
`67`	`67`
`68`		`- $this->ajaxDie(json_encode(['results' => $delete ? 'error' : 'success']));`
	`68`	`+ $this->ajaxRender(json_encode(['results' => $delete ? 'error' : 'success']));`
`69`	`69`	`}`
`70`	`70`	`}`