From c5b415e382c2fa62ea805a95b14f7703dbbe62de Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Thu, 15 Aug 2024 10:54:54 +0200
Subject: [PATCH] Fix: Don't rely on SecureRenderer (@hostep feedback)

---
 .../form/mollie_paymentlink_javascript.phtml  | 26 +++++++-----
 .../create/payment_hold_warning.phtml         | 20 +++++----
 .../system/config/button/apikey.phtml         | 38 ++++++++++-------
 .../system/config/button/compatibility.phtml  | 42 +++++++++++--------
 4 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/view/adminhtml/templates/form/mollie_paymentlink_javascript.phtml b/view/adminhtml/templates/form/mollie_paymentlink_javascript.phtml
index a2e2a307797..7751f2e42d5 100644
--- a/view/adminhtml/templates/form/mollie_paymentlink_javascript.phtml
+++ b/view/adminhtml/templates/form/mollie_paymentlink_javascript.phtml
@@ -8,29 +8,29 @@ use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /** @var SecureHtmlRenderer $secureRenderer */
 
-$scriptString = <<<SCRIPT
-    document.addEventListener('DOMContentLoaded', function () {
+$scriptString = '
+    document.addEventListener(\'DOMContentLoaded\', function () {
         const saveSelectedMethods = () => {
             // Save the selected payment methods to local storage
-            var paymentMethods = document.getElementById('mollie_methods_paymentlink_methods');
+            var paymentMethods = document.getElementById(\'mollie_methods_paymentlink_methods\');
             if (!paymentMethods) {
                 return;
             }
 
-            paymentMethods.addEventListener('change', function () {
+            paymentMethods.addEventListener(\'change\', function () {
                 var selected = [];
                 for (var i = 0; i < paymentMethods.options.length; i++) {
                     if (paymentMethods.options[i].selected) {
                         selected.push(paymentMethods.options[i].value);
                     }
                 }
-                localStorage.setItem('mollie_paymentlink_methods', JSON.stringify(selected));
+                localStorage.setItem(\'mollie_paymentlink_methods\', JSON.stringify(selected));
             });
         };
 
         const setSelectedMethods = () => {
-            var paymentMethods = document.getElementById('mollie_methods_paymentlink_methods');
-            const selectedMethods = JSON.parse(localStorage.getItem('mollie_paymentlink_methods'));
+            var paymentMethods = document.getElementById(\'mollie_methods_paymentlink_methods\');
+            const selectedMethods = JSON.parse(localStorage.getItem(\'mollie_paymentlink_methods\'));
             if (!selectedMethods || !paymentMethods) {
                 return;
             }
@@ -45,11 +45,17 @@ $scriptString = <<<SCRIPT
         saveSelectedMethods();
         setSelectedMethods();
 
-        document.getElementById('order-billing_method').addEventListener('DOMSubtreeModified', () => {
+        document.getElementById(\'order-billing_method\').addEventListener(\'DOMSubtreeModified\', () => {
             saveSelectedMethods();
             setSelectedMethods();
         })
     });
-SCRIPT;
+';
 
-echo $secureRenderer->renderTag('script', [], $scriptString, false);
+// @phpstan-ignore-next-line
+if (isset($secureRenderer)) {
+    echo $secureRenderer->renderTag('script', [], $scriptString, false);
+    return;
+}
+
+echo '<script>' . $scriptString . '</script>';
diff --git a/view/adminhtml/templates/order/shipment/create/payment_hold_warning.phtml b/view/adminhtml/templates/order/shipment/create/payment_hold_warning.phtml
index 5018f42fa81..37485d101a4 100644
--- a/view/adminhtml/templates/order/shipment/create/payment_hold_warning.phtml
+++ b/view/adminhtml/templates/order/shipment/create/payment_hold_warning.phtml
@@ -16,12 +16,12 @@ use Magento\Framework\View\Helper\SecureHtmlRenderer;
 </div>
 
 <?php
-$scriptString = <<<SCRIPT
+$scriptString = '
     (() => {
-        let warningElement = document.querySelector('.mollie-manual-capture-warning');
-        let fields = Array.from(document.querySelectorAll('.qty-item'));
+        let warningElement = document.querySelector(\'.mollie-manual-capture-warning\');
+        let fields = Array.from(document.querySelectorAll(\'.qty-item\'));
         fields.forEach(function (item) {
-            item.addEventListener('change', function (event) {
+            item.addEventListener(\'change\', function (event) {
                 checkFields();
             });
         });
@@ -31,11 +31,17 @@ $scriptString = <<<SCRIPT
                 return element.value != element.defaultValue;
             })
 
-            warningElement.style.display = alteredFields.length ? 'block' : 'none';
+            warningElement.style.display = alteredFields.length ? \'block\' : \'none\';
         }
 
         checkFields();
     })();
-SCRIPT;
+';
 
-echo $secureRenderer->renderTag('script', [], $scriptString, false);
+// @phpstan-ignore-next-line
+if (isset($secureRenderer)) {
+    echo $secureRenderer->renderTag('script', [], $scriptString, false);
+    return;
+}
+
+echo '<script>' . $scriptString . '</script>';
diff --git a/view/adminhtml/templates/system/config/button/apikey.phtml b/view/adminhtml/templates/system/config/button/apikey.phtml
index 79b69a60dae..edb832cc125 100644
--- a/view/adminhtml/templates/system/config/button/apikey.phtml
+++ b/view/adminhtml/templates/system/config/button/apikey.phtml
@@ -13,44 +13,52 @@ use Mollie\Payment\Block\Adminhtml\System\Config\Form\Apikey\Checker;
  * @var SecureHtmlRenderer $secureRenderer
  */
 
-$scriptString = <<<SCRIPT
+$scriptString = '
     require([
-        'jquery',
-        'prototype'
+        \'jquery\',
+        \'prototype\'
     ], function (jQuery) {
-        var resultSpan = jQuery('#result_apikey');
-        jQuery('#apikey_button').click(function () {
+        var resultSpan = jQuery(\'#result_apikey\');
+        jQuery(\'#apikey_button\').click(function () {
             var params = {
                 "test_key": jQuery("#mollie_general_api_details_apikey_test").val(),
                 "live_key": jQuery("#mollie_general_api_details_apikey_live").val()
             	};
-            new Ajax.Request('{$block->getAjaxUrl()}', {
+            new Ajax.Request(\'{$block->getAjaxUrl()}\', {
                 parameters: params,
                 loaderArea: false,
                 asynchronous: true,
                 onCreate: function () {
-                    resultSpan.find('.connecting').show();
-                    resultSpan.find('.result').hide();
+                    resultSpan.find(\'.connecting\').show();
+                    resultSpan.find(\'.result\').hide();
                 },
                 onSuccess: function (response) {
-                    resultSpan.find('.connecting').hide();
-                    var resultText = '';
+                    resultSpan.find(\'.connecting\').hide();
+                    var resultText = \'\';
                     if (response.status > 200) {
                         resultText = response.statusText;
                     } else {
                         var json = response.responseJSON;
-                        if (typeof json.msg != 'undefined') {
+                        if (typeof json.msg != \'undefined\') {
                             resultText = json.msg;
                         }
                     }
-                    resultSpan.find('.result').show();
-                    resultSpan.find('.result').html(resultText);
+                    resultSpan.find(\'.result\').show();
+                    resultSpan.find(\'.result\').html(resultText);
                 }
             });
         });
     });
-SCRIPT;
+';
 
-echo $secureRenderer->renderTag('script', [], $scriptString, false);
+// @phpstan-ignore-next-line
+if (isset($secureRenderer)) {
+    echo $secureRenderer->renderTag('script', [], $scriptString, false);
+}
+
+// @phpstan-ignore-next-line
+if (!isset($secureRenderer)) {
+    echo '<script>' . $scriptString . '</script>';
+}
 
 echo $block->getButtonHtml();
diff --git a/view/adminhtml/templates/system/config/button/compatibility.phtml b/view/adminhtml/templates/system/config/button/compatibility.phtml
index 9afa0b54d1b..f0161393009 100644
--- a/view/adminhtml/templates/system/config/button/compatibility.phtml
+++ b/view/adminhtml/templates/system/config/button/compatibility.phtml
@@ -13,45 +13,53 @@ use Mollie\Payment\Block\Adminhtml\System\Config\Form\Compatibility\Checker;
  * @var SecureHtmlRenderer $secureRenderer
  */
 
-$scriptString = <<<SCRIPT
+$scriptString = '
     require([
-        'jquery',
-        'mage/translate',
-        'prototype',
+        \'jquery\',
+        \'mage/translate\',
+        \'prototype\',
     ], function (jQuery, \$t) {
-        var resultSpan = jQuery('#result_compatibility');
-        jQuery('#compatibility_button').click(function () {
+        var resultSpan = jQuery(\'#result_compatibility\');
+        jQuery(\'#compatibility_button\').click(function () {
             var params = {};
-            new Ajax.Request('{$block->getAjaxUrl()}', {
+            new Ajax.Request(\'{$block->getAjaxUrl()}\', {
                 parameters: params,
                 loaderArea: false,
                 asynchronous: true,
                 onCreate: function () {
-                    resultSpan.find('.connecting').show();
-                    resultSpan.find('.result').hide();
+                    resultSpan.find(\'.connecting\').show();
+                    resultSpan.find(\'.result\').hide();
                 },
                 onSuccess: function (response) {
-                    resultSpan.find('.connecting').hide();
-                    var resultText = '';
+                    resultSpan.find(\'.connecting\').hide();
+                    var resultText = \'\';
                     if (response.status > 200) {
                         resultText = response.statusText;
                     } else {
                         var json = response.responseJSON;
-                        if (typeof json.msg != 'undefined') {
+                        if (typeof json.msg != \'undefined\') {
                             resultText = json.msg;
                         } else {
-                            resultText = \$t('Invalid response received. This indicates an unknown problem.');
+                            resultText = \$t(\'Invalid response received. This indicates an unknown problem.\');
                         }
                     }
-                    resultSpan.find('.result').show();
-                    resultSpan.find('.result').html(resultText);
+                    resultSpan.find(\'.result\').show();
+                    resultSpan.find(\'.result\').html(resultText);
                 }
             });
         });
 
     });
-SCRIPT;
+';
 
-echo $secureRenderer->renderTag('script', [], $scriptString, false);
+// @phpstan-ignore-next-line
+if (isset($secureRenderer)) {
+    echo $secureRenderer->renderTag('script', [], $scriptString, false);
+}
+
+// @phpstan-ignore-next-line
+if (!isset($secureRenderer)) {
+    echo '<script>' . $scriptString . '</script>';
+}
 
 echo $block->getButtonHtml();