Merge pull request #17 from Invertus/main

4.5.3 release changes
mollie · Sep 7, 2022 · f48782a · f48782a
2 parents be4eec3 + 0e8708e
commit f48782a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 101 deletions.
diff --git a/.github/workflows/midnight_status_check.yml b/.github/workflows/midnight_status_check.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.1' ]
+        php-versions: [ '5.6' ]
 
     steps:
       - name: Checkout
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        presta-versions: [ '1.7.6.8', '1.6.1.23', '1.7.7.0' ]
+        presta-versions: ['1.6.1.23']
     steps:
       - name: Checkout
         uses: actions/[email protected]

diff --git a/controllers/front/return.php b/controllers/front/return.php
@@ -92,6 +92,7 @@ public function initContent()
             // any paid payments for this cart?
 
             if (false === $data['mollie_info']) {
+                /* @phpstan-ignore-next-line */
                 $data['mollie_info'] = $paymentMethodRepo->getPaymentBy('order_id', (int) Order::getOrderByCartId($idCart));
             }
             if (false === $data['mollie_info']) {

diff --git a/tests/phpstan/phpstan1.7.6.8.neon b/tests/phpstan/phpstan1.7.6.8.neon
diff --git a/tests/phpstan/phpstan1.7.7.0.neon b/tests/phpstan/phpstan1.7.7.0.neon
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -137,14 +137,14 @@
                                     {l s='The description to be used for this transaction. These variables are available:' mod='mollie'}
                                 </p>
                                 <p class="help-block">
-                                    <b>{'{orderNumber}'}</b>,
-                                    <b>{'{storeName}'}</b>,
-                                    <b>{'{countryCode}'}</b>,
-                                    <b>{'{cart.id}'}</b>,
-                                    <b>{'{order.reference}'}</b>,
-                                    <b>{'{customer.firstname}'}</b>,
-                                    <b>{'{customer.lastname}'}</b>,
-                                    <b>{'{customer.company}'}</b>
+                                    <b>{'{orderNumber}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{storeName}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{countryCode}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{cart.id}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{order.reference}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{customer.firstname}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{customer.lastname}'|escape:'htmlall':'UTF-8'}</b>,
+                                    <b>{'{customer.company}'|escape:'htmlall':'UTF-8'}</b>
                                 </p>
                             </div>
                         </div>