From 0ef22c6a3d911c86ed9ebad605b04e1a4e4d08a9 Mon Sep 17 00:00:00 2001
From: Jisse Reitsma <jisse@yireo.com>
Date: Thu, 22 Aug 2024 16:21:42 +0200
Subject: [PATCH] Revert back to hard-coded proxy #242

---
 CHANGELOG.md                    |  4 ++++
 Util/SecureHtmlRendererStub.php |  2 +-
 composer.json                   |  2 +-
 etc/frontend/di.xml             | 16 ----------------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0975f8..d0a655d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.9.5] - 22 August 2024
+### Fixed
+- Revert back to hard-coded proxy #242
+
 ## [3.9.4] - 14 August 2024
 ### Fixed
 - Guarantee `subtotal` is always float
diff --git a/Util/SecureHtmlRendererStub.php b/Util/SecureHtmlRendererStub.php
index d62d745..857cba7 100644
--- a/Util/SecureHtmlRendererStub.php
+++ b/Util/SecureHtmlRendererStub.php
@@ -12,7 +12,7 @@
 namespace Yireo\GoogleTagManager2\Util;
 
 if (class_exists('\Magento\Framework\View\Helper\SecureHtmlRenderer')) {
-    class SecureHtmlRendererStub extends \Magento\Framework\View\Helper\SecureHtmlRenderer {}
+    class SecureHtmlRendererStub extends \Magento\Framework\View\Helper\SecureHtmlRenderer\Proxy {}
 } else {
     class SecureHtmlRendererStub
     {
diff --git a/composer.json b/composer.json
index a9979f1..16626d8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "yireo/magento2-googletagmanager2",
-  "version": "3.9.4",
+  "version": "3.9.5",
   "license": "OSL-3.0",
   "type": "magento2-module",
   "homepage": "https://www.yireo.com/software/magento-extensions/googletagmanager2",
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 6bde31a..5083e64 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -31,20 +31,4 @@
             </argument>
         </arguments>
     </type>
-
-    <type name="Yireo\GoogleTagManager2\Observer\FixNonExistingSecureRenderer">
-        <arguments>
-            <argument name="secureHtmlRendererStub" xsi:type="object">
-                Yireo\GoogleTagManager2\Util\SecureHtmlRendererStub\Proxy
-            </argument>
-        </arguments>
-    </type>
-
-    <type name="Yireo\GoogleTagManager2\Plugin\AddCspInlineScripts">
-        <arguments>
-            <argument name="secureHtmlRendererStub" xsi:type="object">
-                Yireo\GoogleTagManager2\Util\SecureHtmlRendererStub\Proxy
-            </argument>
-        </arguments>
-    </type>
 </config>