From 898379d4a34a614776c3b4dbbd9086cf034512fa Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:38:30 +0200
Subject: [PATCH 01/23] feat: bucket slider

---
 .../RenderLayered/SliderRenderer.php          |  64 +++++++++-
 Model/Catalog/Layer/Filter.php                |  25 ++++
 Model/Client/Type/FacetType.php               |  26 +++-
 Model/Client/Type/FacetType/SettingsType.php  |  16 +++
 Model/NavigationConfig.php                    |   2 +
 .../templates/product/layered/slider.phtml    | 117 ++++++++++++++++--
 .../web/js/navigation-slider-widget.js        |  20 +++
 7 files changed, 256 insertions(+), 14 deletions(-)

diff --git a/Block/LayeredNavigation/RenderLayered/SliderRenderer.php b/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
index efded38c..66e5afe1 100644
--- a/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
+++ b/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
@@ -85,7 +85,6 @@ protected function getItemValue($index, $default = 0)
 
         return (float) $items[$index]->getLabel();
     }
-
     /**
      * @return int
      */
@@ -173,4 +172,67 @@ public function getCssId()
 
         return 'slider-' . $urlKey;
     }
+
+    /**
+     * @return bool
+     */
+    public function containsBuckets(): bool
+    {
+        return $this->filter->getFacet()->getFacetSettings()->containsBuckets();
+    }
+
+    /**
+     * @return bool
+     */
+    public function containsClickpoints(): bool
+    {
+        return $this->filter->getFacet()->getFacetSettings()->containsClickpoints();
+    }
+
+    /**
+     * @return array
+     */
+    public function getBuckets() : array
+    {
+        if ($this->containsBuckets()) {
+            return $this->filter->getFacet()->getBuckets();
+        }
+
+        return [];
+    }
+
+    public function getClickPoints() : array
+    {
+        if ($this->containsClickpoints()) {
+            return $this->filter->getFacet()->getClickpoints();
+        }
+
+        return [];
+    }
+
+    public function getBucketHightFactor() : float
+    {
+        $maxRelativeRange = 1;
+        if ($this->containsBuckets()) {
+            $buckets = $this->getBuckets();
+            foreach ($buckets as $bucket) {
+                //get max range from bucket array
+                if ($bucket['relativeamount'] > $maxRelativeRange) {
+                    $relativeAmount = ceil($bucket['relativeamount']);
+                    if ($relativeAmount > $maxRelativeRange) {
+                        $maxRelativeRange = $relativeAmount;
+                    }
+                }
+            }
+        }
+
+        $bucketHightFactor = 60 / $maxRelativeRange;
+
+        return $bucketHightFactor;
+    }
+
+    public function getTotalrange() : float
+    {
+        return ($this->getMaxValue() - $this->getMinValue());
+    }
 }
diff --git a/Model/Catalog/Layer/Filter.php b/Model/Catalog/Layer/Filter.php
index 9ce3a445..d6ec77ee 100644
--- a/Model/Catalog/Layer/Filter.php
+++ b/Model/Catalog/Layer/Filter.php
@@ -42,6 +42,11 @@ class Filter extends AbstractFilter implements FilterInterface
      */
     protected $items;
 
+    /**
+     * @var array
+     */
+    protected $buckets;
+
     /**
      * @var Layer
      */
@@ -174,6 +179,18 @@ public function getItems()
         return $this->items;
     }
 
+    /**
+     * @return array
+     */
+    public function getBuckets() : array
+    {
+        if (!$this->buckets) {
+            $this->initBuckets();
+        }
+
+        return $this->buckets;
+    }
+
     /**
      * @param AttributeType $item
      * @return $this
@@ -375,6 +392,14 @@ protected function initItems()
         return $this;
     }
 
+    /**
+     * @return void
+     */
+    protected function initBuckets() : void
+    {
+        $this->buckets = $this->facet->getBuckets();
+    }
+
     /**
      * @return int[]
      */
diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index 56ca4cfd..a00155ef 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -51,7 +51,7 @@ public function setAttributes(array $attributes)
         $this->data['attributes'] = $values;
         return $this;
     }
-        
+
     public function getFacetSettings(): ?SettingsType
     {
         return $this->getValue('facet_settings');
@@ -64,4 +64,28 @@ public function getAttributes(): ?array
     {
         return $this->getValue('attributes');
     }
+
+    /**
+     * @return array
+     */
+    public function getBuckets(): array {
+        //only return buckets if there is more than one bucket
+        if (isset($this->data['buckets']['bucket'][0]) && is_array($this->data['buckets']['bucket'][0])) {
+            return $this->data['buckets']['bucket'];
+        }
+
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getClickpoints(): array {
+        if (isset($this->data['clickpoints']['clickpoint'][0]) && is_array($this->data['clickpoints']['clickpoint'][0])) {
+            return $this->data['clickpoints']['clickpoint'];
+        } else if (isset($this->data['clickpoints']['clickpoint'])) {
+            return $this->data['clickpoints'];
+        }
+        return [];
+    }
 }
diff --git a/Model/Client/Type/FacetType/SettingsType.php b/Model/Client/Type/FacetType/SettingsType.php
index 00bc28ef..dc2754fb 100644
--- a/Model/Client/Type/FacetType/SettingsType.php
+++ b/Model/Client/Type/FacetType/SettingsType.php
@@ -234,4 +234,20 @@ public function getSearchNoResultsText()
     {
         return empty($this->getValue('searchnoresultstext')) ? '' : $this->getValue('searchnoresultstext');
     }
+
+    /**
+     * @return bool
+     */
+    public function containsBuckets() : bool
+    {
+        return $this->getBoolValue('containsbuckets');
+    }
+
+    /**
+     * @return bool
+     */
+    public function containsClickpoints() : bool
+    {
+        return $this->getBoolValue('containsclickpoints');
+    }
 }
diff --git a/Model/NavigationConfig.php b/Model/NavigationConfig.php
index 5b272c31..373d7058 100644
--- a/Model/NavigationConfig.php
+++ b/Model/NavigationConfig.php
@@ -158,6 +158,8 @@ public function getJsSliderConfig(SliderRenderer $sliderRenderer)
                     'max' => $sliderRenderer->getMaxValue(),
                     'currentMin' => $sliderRenderer->getCurrentMinValue(),
                     'currentMax' => $sliderRenderer->getCurrentMaxValue(),
+                    'containsBuckets' => $sliderRenderer->containsBuckets(),
+                    'containsClickpoints' => $sliderRenderer->containsClickpoints(),
                 ]
             ]
         );
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 7c5979e7..f6aefe18 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -16,24 +16,58 @@ $itemPostfix = $block->getItemPostfix();
 $urlKey = $block->getUrlKey();
 $minValue = $block->getMinValue();
 $maxValue = $block->getMaxValue();
+$totalRange = $block->getTotalRange();
 $currentMinValue = $block->getCurrentMinValue();
 $currentMaxValue = $block->getCurrentMaxValue();
 $sliderUrlInputValue = sprintf('%s-%s', $currentMinValue, $currentMaxValue);
 $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
+$cointainsBuckets = $block->containsBuckets();
+$cointainsClickpoints = $block->containsClickpoints();
+$clickpointCounter = 0;
 ?>
 <div class="slider-attribute" id="attribute-slider-<?=$block->getCssId()?>">
-    <div class="labels">
-        <span class="min-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?=$block->renderValue($minValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
-        </span>
-        <span class="max-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?=$block->renderValue($maxValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
-        </span>
-    </div>
+        <?php
+    if ($cointainsBuckets): ?>
+        <div class="buckets">
+            <?php
+            $bucketHightFactor = $block->getBucketHightFactor();
+            ?>
+            <?php foreach($block->getBuckets() as $bucket): ?>
+                <?php
+                $rangeMin = floor($bucket['rangemin']);
+                $rangeMax = ceil($bucket['rangemax']);
+                $bucketHeight = floor($bucket['relativeamount'] * $bucketHightFactor);
+                $bucketWidth = (($rangeMax - $rangeMin) / $totalRange) * 100;
+                ?>
+                <a href="javascript:void(0);" class="bucket-link" style="width: <?= $bucketWidth ?>%" data-rangemin="<?= $rangeMin ?>" data-rangemax="<?= $rangeMax ?>">
+                    <div class="bucket-range" style="height: <?= $bucketHeight ?>px;">
+                    </div>
+                </a>
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+    <?php if ($cointainsClickpoints): ?>
+        <?php
+            $totalClickpoints = count($block->getClickpoints());
+            $totalClickpointsRange = $totalRange + ($totalClickpoints * 2);
+        ?>
+        <div class="indicators">
+            <?php foreach($block->getClickpoints() as $clickpoint): ?>
+                <?php
+                $clickpointWidth = 10 * $clickpointCounter;
+                $clickpointPosition = floor((($clickpoint['value'] - $minValue) / $totalClickpointsRange) * 100);
+                $clickpointCounter++;
+                ?>
+            <a>
+                <div class="indicator" style="left: <?= $clickpointPosition ?>%">
+                    <div class="indicator-number"><?= ceil($clickpoint['value']) ?></div>
+                    <div class="indicator-arrow"></div>
+                </div>
+            </a>
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+
     <div class="slider" data-mage-init="<?=$escaper->escapeHtmlAttr($block->getJsSliderConfig())?>"></div>
     <div class="labels">
         <span class="current-min-value">
@@ -78,3 +112,62 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
         >
     </div>
 </div>
+
+<style>
+    .buckets {
+        display: flex;
+        align-items: flex-end; /* Align children to the bottom */
+        width: calc(100% - 20px);
+        margin-left: 5px;
+        position: relative; /* Ensure clickpoints are positioned relative to this container */
+    }
+
+    .bucket-range {
+        background-color: #f1f1f1;
+        border: 1px solid #e0e0e0;
+        border-radius: 1px;
+        margin: 0 0px;
+        display: flex;
+        align-items: flex-end; /* Align the content to the bottom */
+    }
+
+    .bucket-link {
+        margin: 0 1px;
+        text-decoration: none !important; /* Remove underline from links */
+    }
+
+    .bucket-link:hover{
+        background-color: inherit !important;
+    }
+
+    .slider-attribute {
+        position: relative; /* Ensure the indicator is positioned relative to the slider-attribute container */
+    }
+
+    .indicators {
+        height: 20px;
+        margin-top: 5px;
+        margin-bottom: 10px;
+        width: calc(100% - 20px);
+    }
+
+    .indicator {
+        width: 30px;
+        float: left;
+        position: absolute; /* Ensure the arrow is positioned relative to the indicator */
+    }
+
+    .indicator-arrow {
+        width: 0;
+        height: 0;
+        text-align: right;
+        border-left: 5px solid transparent;
+        border-right: 5px solid transparent;
+        border-top: 10px solid black; /* Change to border-top to point the arrow upwards */
+    }
+
+    .indicator-number {
+        text-align: left;
+        font-size: 12px;
+    }
+</style>
diff --git a/view/frontend/web/js/navigation-slider-widget.js b/view/frontend/web/js/navigation-slider-widget.js
index 576a8b19..b5a8449d 100644
--- a/view/frontend/web/js/navigation-slider-widget.js
+++ b/view/frontend/web/js/navigation-slider-widget.js
@@ -24,6 +24,8 @@ define([
             currentMax: 99999999,
             formFilters: false,
             ajaxFilters: false,
+            containsBucket: false,
+            containsClickpoints: false
         },
 
         /**
@@ -88,6 +90,10 @@ define([
             var sliderContainer = $(this.options.container);
             sliderContainer.on('change', '.slider-min', this._updateSliderUrlInput.bind(this));
             sliderContainer.on('change', '.slider-max', this._updateSliderUrlInput.bind(this));
+            if (this.options.containsBucket) {
+                sliderContainer.on('click', '.bucket-link', this._clickBucketSlider.bind(this));
+            }
+
         },
 
         /**
@@ -105,6 +111,20 @@ define([
             this._updateSliderDisabledAttribute(sliderUrlInput, inputValue)
         },
 
+        _clickBucketSlider: function (event) {
+
+            var sliderContainer = $(this.options.container);
+            var sliderUrlInput = sliderContainer.find('.slider-url-value');
+            var bucket = $(event.currentTarget);
+            var minValue = bucket.data('rangemin');
+            var maxValue = bucket.data('rangemax');
+            var inputValue = minValue + '-' + maxValue;
+            sliderUrlInput.val(inputValue);
+            // Trigger change event on sliderUrlInput
+            this._updateSliderDisabledAttribute(sliderUrlInput, inputValue);
+            sliderUrlInput.trigger('change');
+        },
+
         /**
          *
          * @param sliderUrlInput

From e1534d7f353c4c0b5b427072af37afe5284bc55f Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:48:33 +0200
Subject: [PATCH 02/23] style fixes

---
 .../RenderLayered/SliderRenderer.php                  |  9 +++++----
 Model/Catalog/Layer/Filter.php                        |  4 ++--
 Model/Client/Type/FacetType.php                       | 11 +++++++----
 Model/Client/Type/FacetType/SettingsType.php          |  4 ++--
 view/frontend/templates/product/layered/slider.phtml  |  4 ++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Block/LayeredNavigation/RenderLayered/SliderRenderer.php b/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
index 66e5afe1..14b90579 100644
--- a/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
+++ b/Block/LayeredNavigation/RenderLayered/SliderRenderer.php
@@ -85,6 +85,7 @@ protected function getItemValue($index, $default = 0)
 
         return (float) $items[$index]->getLabel();
     }
+
     /**
      * @return int
      */
@@ -192,7 +193,7 @@ public function containsClickpoints(): bool
     /**
      * @return array
      */
-    public function getBuckets() : array
+    public function getBuckets(): array
     {
         if ($this->containsBuckets()) {
             return $this->filter->getFacet()->getBuckets();
@@ -201,7 +202,7 @@ public function getBuckets() : array
         return [];
     }
 
-    public function getClickPoints() : array
+    public function getClickPoints(): array
     {
         if ($this->containsClickpoints()) {
             return $this->filter->getFacet()->getClickpoints();
@@ -210,7 +211,7 @@ public function getClickPoints() : array
         return [];
     }
 
-    public function getBucketHightFactor() : float
+    public function getBucketHightFactor(): float
     {
         $maxRelativeRange = 1;
         if ($this->containsBuckets()) {
@@ -231,7 +232,7 @@ public function getBucketHightFactor() : float
         return $bucketHightFactor;
     }
 
-    public function getTotalrange() : float
+    public function getTotalrange(): float
     {
         return ($this->getMaxValue() - $this->getMinValue());
     }
diff --git a/Model/Catalog/Layer/Filter.php b/Model/Catalog/Layer/Filter.php
index d6ec77ee..9e1237d3 100644
--- a/Model/Catalog/Layer/Filter.php
+++ b/Model/Catalog/Layer/Filter.php
@@ -182,7 +182,7 @@ public function getItems()
     /**
      * @return array
      */
-    public function getBuckets() : array
+    public function getBuckets(): array
     {
         if (!$this->buckets) {
             $this->initBuckets();
@@ -395,7 +395,7 @@ protected function initItems()
     /**
      * @return void
      */
-    protected function initBuckets() : void
+    protected function initBuckets(): void
     {
         $this->buckets = $this->facet->getBuckets();
     }
diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index a00155ef..9d581600 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -68,7 +68,8 @@ public function getAttributes(): ?array
     /**
      * @return array
      */
-    public function getBuckets(): array {
+    public function getBuckets(): array
+    {
         //only return buckets if there is more than one bucket
         if (isset($this->data['buckets']['bucket'][0]) && is_array($this->data['buckets']['bucket'][0])) {
             return $this->data['buckets']['bucket'];
@@ -80,10 +81,12 @@ public function getBuckets(): array {
     /**
      * @return array
      */
-    public function getClickpoints(): array {
-        if (isset($this->data['clickpoints']['clickpoint'][0]) && is_array($this->data['clickpoints']['clickpoint'][0])) {
+    public function getClickpoints(): array
+    {
+        if (isset($this->data['clickpoints']['clickpoint'][0])
+            && is_array($this->data['clickpoints']['clickpoint'][0])) {
             return $this->data['clickpoints']['clickpoint'];
-        } else if (isset($this->data['clickpoints']['clickpoint'])) {
+        } elseif (isset($this->data['clickpoints']['clickpoint'])) {
             return $this->data['clickpoints'];
         }
         return [];
diff --git a/Model/Client/Type/FacetType/SettingsType.php b/Model/Client/Type/FacetType/SettingsType.php
index dc2754fb..bfdf63cd 100644
--- a/Model/Client/Type/FacetType/SettingsType.php
+++ b/Model/Client/Type/FacetType/SettingsType.php
@@ -238,7 +238,7 @@ public function getSearchNoResultsText()
     /**
      * @return bool
      */
-    public function containsBuckets() : bool
+    public function containsBuckets(): bool
     {
         return $this->getBoolValue('containsbuckets');
     }
@@ -246,7 +246,7 @@ public function containsBuckets() : bool
     /**
      * @return bool
      */
-    public function containsClickpoints() : bool
+    public function containsClickpoints(): bool
     {
         return $this->getBoolValue('containsclickpoints');
     }
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index f6aefe18..33d0a5cf 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -32,7 +32,7 @@ $clickpointCounter = 0;
             <?php
             $bucketHightFactor = $block->getBucketHightFactor();
             ?>
-            <?php foreach($block->getBuckets() as $bucket): ?>
+            <?php foreach ($block->getBuckets() as $bucket): ?>
                 <?php
                 $rangeMin = floor($bucket['rangemin']);
                 $rangeMax = ceil($bucket['rangemax']);
@@ -52,7 +52,7 @@ $clickpointCounter = 0;
             $totalClickpointsRange = $totalRange + ($totalClickpoints * 2);
         ?>
         <div class="indicators">
-            <?php foreach($block->getClickpoints() as $clickpoint): ?>
+            <?php foreach ($block->getClickpoints() as $clickpoint): ?>
                 <?php
                 $clickpointWidth = 10 * $clickpointCounter;
                 $clickpointPosition = floor((($clickpoint['value'] - $minValue) / $totalClickpointsRange) * 100);

From 9f5a27e4dfdcd11ea823ee3464ca9765b4e72d9e Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:12:14 +0200
Subject: [PATCH 03/23] Style fixes

---
 Model/Client/Type/FacetType.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index 9d581600..cec15c80 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -83,12 +83,15 @@ public function getBuckets(): array
      */
     public function getClickpoints(): array
     {
-        if (isset($this->data['clickpoints']['clickpoint'][0])
-            && is_array($this->data['clickpoints']['clickpoint'][0])) {
+        if (
+            isset($this->data['clickpoints']['clickpoint'][0])
+            && is_array($this->data['clickpoints']['clickpoint'][0]))
+        {
             return $this->data['clickpoints']['clickpoint'];
         } elseif (isset($this->data['clickpoints']['clickpoint'])) {
             return $this->data['clickpoints'];
         }
+        
         return [];
     }
 }

From 6d7038236861db5c3e660f6518bfee0382fb46f7 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:31:56 +0200
Subject: [PATCH 04/23] Stye fixes

---
 Model/Client/Type/FacetType.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index cec15c80..efc1778e 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -83,15 +83,13 @@ public function getBuckets(): array
      */
     public function getClickpoints(): array
     {
-        if (
-            isset($this->data['clickpoints']['clickpoint'][0])
-            && is_array($this->data['clickpoints']['clickpoint'][0]))
+        if (isset($this->data['clickpoints']['clickpoint'][0]) && is_array($this->data['clickpoints']['clickpoint'][0]))
         {
             return $this->data['clickpoints']['clickpoint'];
         } elseif (isset($this->data['clickpoints']['clickpoint'])) {
             return $this->data['clickpoints'];
         }
-        
+
         return [];
     }
 }

From 242db3f689cd8e062657e8891ffb901ae77a348f Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:35:05 +0200
Subject: [PATCH 05/23] Style fixes

---
 Model/Client/Type/FacetType.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index efc1778e..fd5055cf 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -83,8 +83,9 @@ public function getBuckets(): array
      */
     public function getClickpoints(): array
     {
-        if (isset($this->data['clickpoints']['clickpoint'][0]) && is_array($this->data['clickpoints']['clickpoint'][0]))
-        {
+        if (isset($this->data['clickpoints']['clickpoint'][0])
+            && is_array($this->data['clickpoints']['clickpoint'][0])
+        ) {
             return $this->data['clickpoints']['clickpoint'];
         } elseif (isset($this->data['clickpoints']['clickpoint'])) {
             return $this->data['clickpoints'];

From 20539078975e2392144b955b25be71d69c079268 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:37:30 +0200
Subject: [PATCH 06/23] Style fixes

---
 Model/Client/Type/FacetType.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Model/Client/Type/FacetType.php b/Model/Client/Type/FacetType.php
index fd5055cf..16a6d343 100644
--- a/Model/Client/Type/FacetType.php
+++ b/Model/Client/Type/FacetType.php
@@ -83,7 +83,8 @@ public function getBuckets(): array
      */
     public function getClickpoints(): array
     {
-        if (isset($this->data['clickpoints']['clickpoint'][0])
+        if (
+            isset($this->data['clickpoints']['clickpoint'][0])
             && is_array($this->data['clickpoints']['clickpoint'][0])
         ) {
             return $this->data['clickpoints']['clickpoint'];

From 97ea26da0c27fd9f74f935eb8fc82adac2ec539d Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:17:34 +0200
Subject: [PATCH 07/23] fix: remove phpcs disable

---
 view/frontend/templates/form.mini.phtml                 | 1 -
 view/frontend/templates/layer/state.phtml               | 1 -
 view/frontend/templates/layer/view.phtml                | 1 -
 view/frontend/templates/product/layered/default.phtml   | 1 -
 view/frontend/templates/product/layered/link.phtml      | 1 -
 view/frontend/templates/product/layered/link/item.phtml | 1 -
 view/frontend/templates/product/layered/slider.phtml    | 1 -
 view/frontend/templates/product/layered/tree.phtml      | 1 -
 view/frontend/templates/product/layered/tree/item.phtml | 1 -
 9 files changed, 9 deletions(-)

diff --git a/view/frontend/templates/form.mini.phtml b/view/frontend/templates/form.mini.phtml
index 0730c8f5..216eed86 100644
--- a/view/frontend/templates/form.mini.phtml
+++ b/view/frontend/templates/form.mini.phtml
@@ -9,7 +9,6 @@
 /**
  * @var $block \Tweakwise\Magento2Tweakwise\Block\Autocomplete\FormMini
  * @var $escaper Escaper
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  * phpcs:disable Magento2.Legacy.PhtmlTemplate.TextJavascriptTypeFound
  */
 
diff --git a/view/frontend/templates/layer/state.phtml b/view/frontend/templates/layer/state.phtml
index a8045296..c21361ed 100644
--- a/view/frontend/templates/layer/state.phtml
+++ b/view/frontend/templates/layer/state.phtml
@@ -13,7 +13,6 @@ use Magento\Framework\Escaper;
  *
  * @var $block \Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\Navigation\State
  * @var $escaper Escaper
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 ?>
 <?php /** @var Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item[] $_filters */ ?>
diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index 4e8b54ac..1ea478a0 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -12,7 +12,6 @@ use Magento\LayeredNavigation\Block\Navigation;
 
 /**
  * @var $block Navigation
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 
 if (!$block->canShowBlock()) {
diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index 1a64a8c4..c1a863e3 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\DefaultRen
 
 /**
  * @var $block DefaultRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 
 $hasHiddenItems = $block->hasHiddenItems();
diff --git a/view/frontend/templates/product/layered/link.phtml b/view/frontend/templates/product/layered/link.phtml
index 4aa58c0c..561702ab 100644
--- a/view/frontend/templates/product/layered/link.phtml
+++ b/view/frontend/templates/product/layered/link.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
 
 /**
  * @var $block \Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\LinkRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 $hasHiddenItems = $block->hasHiddenItems();
 ?>
diff --git a/view/frontend/templates/product/layered/link/item.phtml b/view/frontend/templates/product/layered/link/item.phtml
index 06917972..6e94bbe4 100644
--- a/view/frontend/templates/product/layered/link/item.phtml
+++ b/view/frontend/templates/product/layered/link/item.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\LinkRender
 
 /**
  * @var $block ItemRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 $item = $block->getItem();
 $hasHiddenItems = $block->hasHiddenItems();
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 7c5979e7..624d55af 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\SliderRend
 
 /**
  * @var $block SliderRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 $itemPrefix = $block->getItemPrefix();
 $itemPostfix = $block->getItemPostfix();
diff --git a/view/frontend/templates/product/layered/tree.phtml b/view/frontend/templates/product/layered/tree.phtml
index c5fc38ba..c95c15c4 100644
--- a/view/frontend/templates/product/layered/tree.phtml
+++ b/view/frontend/templates/product/layered/tree.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
 
 /**
  * @var $block TreeRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 ?>
 <ol class="items tree-attribute">
diff --git a/view/frontend/templates/product/layered/tree/item.phtml b/view/frontend/templates/product/layered/tree/item.phtml
index 3e36edc8..4a7cf67f 100644
--- a/view/frontend/templates/product/layered/tree/item.phtml
+++ b/view/frontend/templates/product/layered/tree/item.phtml
@@ -9,7 +9,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
 
 /**
  * @var $block ItemRenderer
- * phpcs:disable Magento2.Security.XssTemplate.FoundUnescaped
  */
 $item = $block->getItem();
 ?>

From dccfbdc64f749c593b9078c4c5811c02af9d9b53 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:27:43 +0200
Subject: [PATCH 08/23] fix: remove noEscapes

---
 Model/Catalog/Layer/Filter.php                |  3 +-
 view/frontend/templates/layer/state.phtml     |  4 +-
 .../templates/product/layered/swatch.phtml    | 46 +++++++++----------
 view/frontend/templates/product/list.phtml    |  2 +-
 .../templates/product/list/item.phtml         | 24 +++++-----
 .../templates/product/list/items.phtml        |  8 ++--
 .../templates/product/list/linked-item.phtml  | 16 +++----
 .../searchbanner/search.banner.phtml          |  2 +-
 8 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/Model/Catalog/Layer/Filter.php b/Model/Catalog/Layer/Filter.php
index 9ce3a445..acc353f1 100644
--- a/Model/Catalog/Layer/Filter.php
+++ b/Model/Catalog/Layer/Filter.php
@@ -257,8 +257,7 @@ public function getAttributeModel()
      */
     public function getName()
     {
-        $title = (string) $this->facet->getFacetSettings()->getTitle();
-        return htmlentities($title);
+        return (string) $this->facet->getFacetSettings()->getTitle();
     }
 
     /**
diff --git a/view/frontend/templates/layer/state.phtml b/view/frontend/templates/layer/state.phtml
index c21361ed..68f50813 100644
--- a/view/frontend/templates/layer/state.phtml
+++ b/view/frontend/templates/layer/state.phtml
@@ -26,7 +26,7 @@ use Magento\Framework\Escaper;
         role="heading"
         aria-level="2"
         data-role="title"
-        data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?>
+        data-count="<?=  count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?>
     </strong>
     <ol class="items">
         <?php foreach ($_filters as $_filter): ?>
@@ -43,7 +43,7 @@ use Magento\Framework\Escaper;
                     ?>
                     <a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
                        data-js-filter-id="<?=$block->getActiveFilterCssId($_filter)?>"
-                       title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
+                       title="<?=  $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
                         <span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
                     </a>
                 </li>
diff --git a/view/frontend/templates/product/layered/swatch.phtml b/view/frontend/templates/product/layered/swatch.phtml
index 8e1f2fe9..5f573a5b 100644
--- a/view/frontend/templates/product/layered/swatch.phtml
+++ b/view/frontend/templates/product/layered/swatch.phtml
@@ -9,9 +9,9 @@
 /** @var $block \Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\SwatchRenderer */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
-<div class="swatch-attribute swatch-layered <?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
-     attribute-code="<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
-     attribute-id="<?= /* @escapeNotVerified */ $swatchData['attribute_id'] ?>"
+<div class="swatch-attribute swatch-layered <?=  $swatchData['attribute_code'] ?>"
+     attribute-code="<?=  $swatchData['attribute_code'] ?>"
+     attribute-id="<?=  $swatchData['attribute_id'] ?>"
      data-mage-init='{"tweakwiseNavigationSort":[]}'>
     <?php if ($block->isSearchable()): ?>
         <input data-max-visible="<?=  $block->getMaxItemsShown()?>" type="text" class="tw_filtersearch js-skip-submit" name="tw_filtersearch" placeholder="<?= $block->getSearchPlaceholder(); ?>" >
@@ -21,7 +21,7 @@
         <?php foreach ($swatchData['options'] as $option => $label): ?>
             <?php $item = $block->getItemForSwatch($option);?>
             <a <?=$block->renderAnchorHtmlTagAttributes($item);?>
-                aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                aria-label="<?=  $label['label'] ?>"
                 class="swatch-option-link-layered"
             >
                 <?php $cssId = $item->getCssId();?>
@@ -35,11 +35,11 @@
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
-                            <div class="swatch-option <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option <?=  $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="3"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-id="<?=  $option ?>"
+                                 option-label="<?=  $label['label'] ?>"
                                  option-tooltip-thumb=""
                                  option-tooltip-value=""
                             ></div>
@@ -50,42 +50,42 @@
                             $swatchData['swatches'][$option]['value']); ?>
                             <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
                             $swatchData['swatches'][$option]['value']); ?>
-                            <div class="swatch-option image <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option image <?=  $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="2"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-                                 option-tooltip-thumb="<?= /* @escapeNotVerified */ $swatchThumbPath ?>"
+                                 option-id="<?=  $option ?>"
+                                 option-label="<?=  $label['label'] ?>"
+                                 option-tooltip-thumb="<?=  $swatchThumbPath ?>"
                                  option-tooltip-value=""
-                                 style="background: url(<?= /* @escapeNotVerified */ $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
+                                 style="background: url(<?=  $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
                             <?php    break;
                         case '1':
                             ?>
-                            <div class="swatch-option color <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option color <?=  $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="1"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-id="<?=  $option ?>"
+                                 option-label="<?=  $label['label'] ?>"
                                  option-tooltip-thumb=""
-                                 option-tooltip-value="<?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?>"
-                                 style="background: <?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
+                                 option-tooltip-value="<?=  $swatchData['swatches'][$option]['value'] ?>"
+                                 style="background: <?=  $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
                             <?php    break;
                         case '0':
                         default:
                             ?>
-                            <div class="swatch-option text <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option text <?=  $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="0"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-id="<?=  $option ?>"
+                                 option-label="<?=  $label['label'] ?>"
                                  option-tooltip-thumb=""
                                  option-tooltip-value=""
-                            ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
+                            ><?=  $swatchData['swatches'][$option]['value'] ?></div>
                             <?php    break;
                     } ?>
                     <?php if ($block->shouldDisplayProductCountOnLayer()): ?>
                         <span class="count">
-                            <?=htmlentities($item->getCount())?>
+                            <?=$item->getCount()?>
                             <span class="filter-count-label">
                                 <?php if ($item->getCount() == 1):?>
                                     <?=__('item')?>
@@ -104,7 +104,7 @@
 
 <script>
     require(["jquery", "Magento_Swatches/js/swatch-renderer"], function ($) {
-        $('.swatch-layered.<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>')
+        $('.swatch-layered.<?=  $swatchData['attribute_code'] ?>')
             .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
             .SwatchRendererTooltip();
     });
diff --git a/view/frontend/templates/product/list.phtml b/view/frontend/templates/product/list.phtml
index 40080fa9..7fbcdfd2 100644
--- a/view/frontend/templates/product/list.phtml
+++ b/view/frontend/templates/product/list.phtml
@@ -46,7 +46,7 @@ $productListItemViewModel = $block->getData('view_model_product_list_item');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
+    <div class="products wrapper <?=  $viewMode ?> products-<?=  $viewMode ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
diff --git a/view/frontend/templates/product/list/item.phtml b/view/frontend/templates/product/list/item.phtml
index 8d53ddb4..d74f3308 100644
--- a/view/frontend/templates/product/list/item.phtml
+++ b/view/frontend/templates/product/list/item.phtml
@@ -27,8 +27,8 @@ $showDescription = $block->getData('show_description');
 ?>
 <li class="item product product-item">
     <div class="product-item-info"
-         id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
-         data-container="product-<?= /* @noEscape */ $viewMode ?>">
+         id="product-item-info_<?=  $_product->getId() ?>"
+         data-container="product-<?=  $viewMode ?>">
         <?php
         $productImage = $block->getImage($_product, $imageDisplayArea);
         if ($pos != null) {
@@ -47,11 +47,11 @@ $showDescription = $block->getData('show_description');
             <strong class="product name product-item-name">
                 <a class="product-item-link"
                    href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
-                    <?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?>
+                    <?= $_helper->productAttribute($_product, $_product->getName(), 'name')?>
                 </a>
             </strong>
             <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
-            <?= /* @noEscape */ $block->getProductPrice($_product) ?>
+            <?=  $block->getProductPrice($_product) ?>
 
             <?= $block->getProductDetailsHtml($_product) ?>
 
@@ -74,11 +74,11 @@ $showDescription = $block->getData('show_description');
                                 <?php endforeach; ?>
                                 <input type="hidden"
                                        name="product"
-                                       value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
+                                       value="<?=  $postParams['data']['product'] ?>">
                                 <input type="hidden"
-                                       name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
+                                       name="<?=  Action::PARAM_NAME_URL_ENCODED ?>"
                                        value="<?=
-                                       /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
+                                        $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
                                         ?>">
                                 <?= $block->getBlockHtml('formkey') ?>
                                 <button type="submit"
@@ -99,7 +99,7 @@ $showDescription = $block->getData('show_description');
                         <?php endif; ?>
                     </div>
                     <?= ($pos && strpos($pos, $viewMode . '-primary')) ?
-                        /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                         $secureRenderer->renderStyleAsTag(
                             $position,
                             'product-item-info_' . $_product->getId() . ' div.actions-primary'
                         ) : '' ?>
@@ -109,20 +109,20 @@ $showDescription = $block->getData('show_description');
                         <?php endif; ?>
                     </div>
                     <?= ($pos && strpos($pos, $viewMode . '-secondary')) ?
-                        /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                         $secureRenderer->renderStyleAsTag(
                             $position,
                             'product-item-info_' . $_product->getId() . ' div.actions-secondary'
                         ) : '' ?>
                 </div>
                 <?php if ($showDescription): ?>
                     <div class="product description product-item-description">
-                        <?= /* @noEscape */ $_helper->productAttribute(
+                        <?=  $_helper->productAttribute(
                             $_product,
                             $_product->getShortDescription(),
                             'short_description'
                         ) ?>
                         <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
-                           title="<?= /* @noEscape */ $_productNameStripped ?>"
+                           title="<?=  $_productNameStripped ?>"
                            class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
                     </div>
                 <?php endif; ?>
@@ -130,7 +130,7 @@ $showDescription = $block->getData('show_description');
         </div>
     </div>
     <?= ($pos && strpos($pos, $viewMode . '-actions')) ?
-        /* @noEscape */ $secureRenderer->renderStyleAsTag(
+         $secureRenderer->renderStyleAsTag(
             $position,
             'product-item-info_' . $_product->getId() . ' div.product-item-actions'
         ) : '' ?>
diff --git a/view/frontend/templates/product/list/items.phtml b/view/frontend/templates/product/list/items.phtml
index 09fc4811..536230d3 100644
--- a/view/frontend/templates/product/list/items.phtml
+++ b/view/frontend/templates/product/list/items.phtml
@@ -167,14 +167,14 @@ $linkedProductListItemViewModel = $block->getData('view_model_linked_product_lis
 <div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
      data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}'
      data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
-     data-shuffle="<?= /* @noEscape */ $shuffle ?>"
-     data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
+     data-shuffle="<?=  $shuffle ?>"
+     data-shuffle-weighted="<?=  $isWeightedRandom ?>">
     <?php else:?>
     <div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
          data-mage-init='{"upsellProducts":{}}'
          data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
-         data-shuffle="<?= /* @noEscape */ $shuffle ?>"
-         data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
+         data-shuffle="<?=  $shuffle ?>"
+         data-shuffle-weighted="<?=  $isWeightedRandom ?>">
         <?php endif; ?>
         <?php else:?>
         <div class="block <?= $escaper->escapeHtmlAttr($class) ?>">
diff --git a/view/frontend/templates/product/list/linked-item.phtml b/view/frontend/templates/product/list/linked-item.phtml
index 3a44a9d6..b0bc6442 100644
--- a/view/frontend/templates/product/list/linked-item.phtml
+++ b/view/frontend/templates/product/list/linked-item.phtml
@@ -33,17 +33,17 @@ $parentBlock = $block->getData('parent_block');
 <?php endif; ?>
 <?php if ($type == 'related' || $type == 'upsell'):?>
     <li class="item product product-item"
-    id="product-item_<?= /* @noEscape */ $_item->getId() ?>"
+    id="product-item_<?=  $_item->getId() ?>"
     data-shuffle-group="<?= $parentBlock->escapeHtmlAttr($_item->getPriority()) ?>" >
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    <?=  $secureRenderer->renderStyleAsTag(
         'display:none;',
         'li#product-item_' . $_item->getId()
     ) ?>
 <?php else:?>
     <li class="item product product-item">
 <?php endif; ?>
-<div class="product-item-info <?= /* @noEscape */ $available ?>">
-    <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+<div class="product-item-info <?=  $available ?>">
+    <?=  '<!-- ' . $image . '-->' ?>
     <a href="<?= $parentBlock->escapeUrl($parentBlock->getProductUrl($_item)) ?>"
        class="product photo product-item-photo">
         <?= $parentBlock->getImage($_item, $image)->toHtml() ?>
@@ -56,7 +56,7 @@ $parentBlock = $block->getData('parent_block');
                 <?= $parentBlock->escapeHtml($_item->getName()) ?></a>
         </strong>
 
-        <?= /* @noEscape */ $parentBlock->getProductPrice($_item) ?>
+        <?=  $parentBlock->getProductPrice($_item) ?>
 
         <?php if ($templateType):?>
             <?= $parentBlock->getReviewsSummaryHtml($_item, $templateType) ?>
@@ -107,10 +107,10 @@ $parentBlock = $block->getData('parent_block');
                                       action="<?= $parentBlock->escapeUrl($parentBlock->getAddToCartUrl($_item)) ?>"
                                       method="post">
                                     <input type="hidden" name="product"
-                                           value="<?= /* @noEscape */ (int)$_item->getEntityId() ?>">
+                                           value="<?=  (int)$_item->getEntityId() ?>">
                                     <input type="hidden"
-                                           name="<?= /* @noEscape */ ActionInterface::PARAM_NAME_URL_ENCODED?>"
-                                           value="<?= /* @noEscape */ $value ?>">
+                                           name="<?=  ActionInterface::PARAM_NAME_URL_ENCODED?>"
+                                           value="<?=  $value ?>">
                                     <?= $parentBlock->getBlockHtml('formkey') ?>
                                     <button type="submit"
                                             title="<?= $parentBlock->escapeHtmlAttr(__('Add to Cart')) ?>"
diff --git a/view/frontend/templates/searchbanner/search.banner.phtml b/view/frontend/templates/searchbanner/search.banner.phtml
index ba983b75..61e4c61d 100644
--- a/view/frontend/templates/searchbanner/search.banner.phtml
+++ b/view/frontend/templates/searchbanner/search.banner.phtml
@@ -4,7 +4,7 @@
 $banners = $block->getData('banners');
 $styling = ($banners[0]['location'] == 'ContainerTop') ? 'style="margin-right: auto; margin-left: auto;"' : '';
 ?>
-<div class="searchbanners" <?= /* @noEscape */ $styling ?>>
+<div class="searchbanners" <?=  $styling ?>>
     <?php foreach ($banners as $banner): ?>
         <?php if (!empty($banner['clickurl'])): ?>
             <a href="<?= $escaper->escapeUrl($banner['clickurl']); ?>" type="<?= $escaper->escapeHtmlAttr($banner['clicktarget']); ?>">

From 51e37a00572990453d6db464a860d526c842d311 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:49:00 +0200
Subject: [PATCH 09/23] fix: remove escaping in wrong locations

---
 .../LayeredNavigation/RenderLayered/AnchorRendererTrait.php | 2 +-
 Block/LayeredNavigation/RenderLayered/DefaultRenderer.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Block/LayeredNavigation/RenderLayered/AnchorRendererTrait.php b/Block/LayeredNavigation/RenderLayered/AnchorRendererTrait.php
index e3216e77..b0137db8 100644
--- a/Block/LayeredNavigation/RenderLayered/AnchorRendererTrait.php
+++ b/Block/LayeredNavigation/RenderLayered/AnchorRendererTrait.php
@@ -47,6 +47,6 @@ protected function getAnchorTagAttributes(Item $item): array
      */
     protected function getItemUrl(Item $item)
     {
-        return $this->escapeHtml($item->getUrl());
+        return $item->getUrl();
     }
 }
diff --git a/Block/LayeredNavigation/RenderLayered/DefaultRenderer.php b/Block/LayeredNavigation/RenderLayered/DefaultRenderer.php
index 041859c2..41e02787 100644
--- a/Block/LayeredNavigation/RenderLayered/DefaultRenderer.php
+++ b/Block/LayeredNavigation/RenderLayered/DefaultRenderer.php
@@ -100,7 +100,7 @@ protected function getFacetSettings()
      */
     public function getCategoryUrl(Item $item): string
     {
-        $catUrl = $this->escapeUrl($item->getUrl());
+        $catUrl = $item->getUrl();
 
         if (strpos($catUrl, $this->getBaseUrl()) === false) {
             $catUrl = $this->getBaseUrl() . $item->getUrl();
@@ -283,7 +283,7 @@ public function showCheckbox()
      */
     public function getItemPrefix()
     {
-        return $this->escapeHtml($this->getFacetSettings()->getPrefix());
+        return $this->getFacetSettings()->getPrefix();
     }
 
     /**
@@ -291,7 +291,7 @@ public function getItemPrefix()
      */
     public function getItemPostfix()
     {
-        return $this->escapeHtml($this->getFacetSettings()->getPostfix());
+        return $this->getFacetSettings()->getPostfix();
     }
 
     /**

From b1a350e602b22dd9447d42899f4552d0b05c6674 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:54:47 +0200
Subject: [PATCH 10/23] add escaper

---
 view/frontend/templates/layer/view.phtml                | 2 ++
 view/frontend/templates/product/layered/default.phtml   | 3 +++
 view/frontend/templates/product/layered/link.phtml      | 3 +++
 view/frontend/templates/product/layered/link/item.phtml | 3 +++
 view/frontend/templates/product/layered/slider.phtml    | 3 +++
 view/frontend/templates/product/layered/swatch.phtml    | 4 ++++
 view/frontend/templates/product/layered/tree.phtml      | 3 +++
 view/frontend/templates/product/layered/tree/item.phtml | 5 ++++-
 8 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index 1ea478a0..93d8dae3 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -6,12 +6,14 @@
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter;
 use Tweakwise\Magento2Tweakwise\Model\NavigationConfig;
 use Magento\LayeredNavigation\Block\Navigation;
 
 /**
  * @var $block Navigation
+ * @var $escaper Escaper
  */
 
 if (!$block->canShowBlock()) {
diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index c1a863e3..43daf6e8 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\DefaultRenderer;
 
 /**
  * @var $block DefaultRenderer
+ * @var $escaper Escaper
  */
 
 $hasHiddenItems = $block->hasHiddenItems();
diff --git a/view/frontend/templates/product/layered/link.phtml b/view/frontend/templates/product/layered/link.phtml
index 561702ab..bb99df29 100644
--- a/view/frontend/templates/product/layered/link.phtml
+++ b/view/frontend/templates/product/layered/link.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRenderer;
 
 /**
  * @var $block \Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\LinkRenderer
+ * @var $escaper Escaper
  */
 $hasHiddenItems = $block->hasHiddenItems();
 ?>
diff --git a/view/frontend/templates/product/layered/link/item.phtml b/view/frontend/templates/product/layered/link/item.phtml
index 6e94bbe4..8b3f3769 100644
--- a/view/frontend/templates/product/layered/link/item.phtml
+++ b/view/frontend/templates/product/layered/link/item.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\LinkRenderer\ItemRenderer;
 
 /**
  * @var $block ItemRenderer
+ * @var $escaper Escaper
  */
 $item = $block->getItem();
 $hasHiddenItems = $block->hasHiddenItems();
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 624d55af..68ce8ced 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\SliderRenderer;
 
 /**
  * @var $block SliderRenderer
+ * @var $escaper Escaper
  */
 $itemPrefix = $block->getItemPrefix();
 $itemPostfix = $block->getItemPostfix();
diff --git a/view/frontend/templates/product/layered/swatch.phtml b/view/frontend/templates/product/layered/swatch.phtml
index 5f573a5b..9a05dae6 100644
--- a/view/frontend/templates/product/layered/swatch.phtml
+++ b/view/frontend/templates/product/layered/swatch.phtml
@@ -7,6 +7,10 @@
 // @codingStandardsIgnoreFile
 
 /** @var $block \Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\SwatchRenderer */
+/** @var $escaper Escaper */
+
+use Magento\Framework\Escaper;
+
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
 <div class="swatch-attribute swatch-layered <?=  $swatchData['attribute_code'] ?>"
diff --git a/view/frontend/templates/product/layered/tree.phtml b/view/frontend/templates/product/layered/tree.phtml
index c95c15c4..d6cc022c 100644
--- a/view/frontend/templates/product/layered/tree.phtml
+++ b/view/frontend/templates/product/layered/tree.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRenderer;
 
 /**
  * @var $block TreeRenderer
+ * @var $escaper Escaper
  */
 ?>
 <ol class="items tree-attribute">
diff --git a/view/frontend/templates/product/layered/tree/item.phtml b/view/frontend/templates/product/layered/tree/item.phtml
index 4a7cf67f..b8910ab5 100644
--- a/view/frontend/templates/product/layered/tree/item.phtml
+++ b/view/frontend/templates/product/layered/tree/item.phtml
@@ -5,10 +5,13 @@
  * @copyright Copyright (c) 2017-2022 Tweakwise.com B.V. (https://www.tweakwise.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+use Magento\Framework\Escaper;
 use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRenderer\ItemRenderer;
 
 /**
  * @var $block ItemRenderer
+ * @var $escaper Escaper
  */
 $item = $block->getItem();
 ?>
@@ -35,7 +38,7 @@ $item = $block->getItem();
     <?php if ($block->hasChildren()): ?>
         <ol class="items child-items">
             <?php foreach ($item->getChildren() as $child): ?>
-                <?=$block->renderTreeItem($child)?>
+                <? $block->renderTreeItem($child)?>
             <?php endforeach; ?>
         </ol>
     <?php endif; ?>

From 217aa99af813fea66fd79d421c05274fb122b3ae Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:31:52 +0200
Subject: [PATCH 11/23] wip

---
 view/frontend/templates/form.mini.phtml          |  6 +++---
 view/frontend/templates/layer/state.phtml        |  4 ++--
 view/frontend/templates/layer/view.phtml         |  8 +++-----
 .../templates/product/layered/default.phtml      | 16 ++++++++--------
 .../templates/product/layered/slider.phtml       |  2 +-
 .../templates/searchbanner/search.banner.phtml   |  9 +++++++--
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/view/frontend/templates/form.mini.phtml b/view/frontend/templates/form.mini.phtml
index 216eed86..c903ba0c 100644
--- a/view/frontend/templates/form.mini.phtml
+++ b/view/frontend/templates/form.mini.phtml
@@ -42,7 +42,7 @@ use Magento\Framework\Escaper;
                     <% } else { %>
                         <span class="special-price">
                             <span class="price-container">
-                                <span class="price-label"><?=__('Special Price')?></span>
+                                <span class="price-label"><?=$escaper->escapeHtml(__('Special Price'))?></span>
                                 <span class="price-wrapper">
                                     <span class="price"><%= autocompleteFormatPrice(data.final_price) %></span>
                                 </span>
@@ -51,7 +51,7 @@ use Magento\Framework\Escaper;
 
                         <span class="old-price sly-old-price">
                             <span class="price-container">
-                                <span class="price-label"><?=__('Regular Price')?></span>
+                                <span class="price-label"><?=$escaper->escapeHtml(__('Regular Price'))?></span>
                                 <span class="price-wrapper">
                                     <span class="price"><%= autocompleteFormatPrice(data.price) %></span>
                                 </span>
@@ -87,7 +87,7 @@ use Magento\Framework\Escaper;
 <script type="text/javascript">
     require(['Magento_Catalog/js/price-utils'], function(priceUtils){
         window['autocompleteFormatPrice'] = function(price) {
-            return priceUtils.formatPrice(price, <?=$block->getJsonPriceFormat()?>);
+            return priceUtils.formatPrice(price, <?=$escaper->escapeJs($block->getJsonPriceFormat())?>);
         };
     });
 </script>
diff --git a/view/frontend/templates/layer/state.phtml b/view/frontend/templates/layer/state.phtml
index 68f50813..ce598cf6 100644
--- a/view/frontend/templates/layer/state.phtml
+++ b/view/frontend/templates/layer/state.phtml
@@ -42,8 +42,8 @@ use Magento\Framework\Escaper;
                         );
                     ?>
                     <a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
-                       data-js-filter-id="<?=$block->getActiveFilterCssId($_filter)?>"
-                       title="<?=  $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
+                       data-js-filter-id="<?=$escaper->escapeHtmlAttr($block->getActiveFilterCssId($_filter))?>"
+                       title="<?=  $escaper->escapeHtmlAttr(__('Remove') . " " . $currentFilterName)?>">
                         <span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
                     </a>
                 </li>
diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index 93d8dae3..b9c6b076 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -37,9 +37,8 @@ if (!$block->canShowBlock()) {
             }
         }
     }'>
-    <?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
-    <div class="block-title filter-title" data-count="<?=$filtered?>">
-        <strong data-role="title"><?=__('Shop By')?></strong>
+    <div class="block-title filter-title" data-count="<?=count($block->getLayer()->getState()->getFilters())?>">
+        <strong data-role="title"><?=$escaper->escapeHtml(__('Shop By'))?></strong>
     </div>
     <div class="block-content filter-content">
         <form id="facet-filter-form" <?=($jsFormConfig ? sprintf('data-mage-init=\'%s\'', $jsFormConfig) : '')?>>
@@ -49,7 +48,7 @@ if (!$block->canShowBlock()) {
             <div class="block-actions filter-actions">
                 <a
                     href="<?=$escaper->escapeUrl($block->getClearUrl()) ?>"
-                    class="action clear filter-clear"><span><?=__('Clear All')?></span>
+                    class="action clear filter-clear"><span><?=$escaper->escapeHtml(__('Clear All'))?></span>
                 </a>
             </div>
         <?php endif; ?>
@@ -79,7 +78,6 @@ if (!$block->canShowBlock()) {
                                     <?=__($filter->getName())?>
                                     <?php $tooltip = $filter->getTooltip(); ?>
                                     <?php if ($tooltip): ?>
-                                        <?php $tooltip = htmlentities($tooltip); ?>
                                         <span class="tooltip" data-tooltip="<?=$tooltip?>"><span>i</span></span>
                                     <?php endif; ?>
                                 </div>
diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index 43daf6e8..e7573a4d 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -22,15 +22,15 @@ $postfix = $block->getItemPostfix();
 $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
 
 ?>
-<div data-mage-init='<?=$block->getJsSortConfig()?>'>
+<div data-mage-init='<?=$escaper->escapeHtmlAttr($block->getJsSortConfig())?>'>
     <?php if ($block->isSearchable()): ?>
         <input
-            data-max-visible="<?=  $block->getMaxItemsShown()?>"
+            data-max-visible="<?= $escaper->escapeHtmlAttr($block->getMaxItemsShown())?>"
             type="text"
             class="tw_filtersearch js-skip-submit"
             name="tw_filtersearch"
-            placeholder="<?= $block->getSearchPlaceholder(); ?>" >
-        <div style="display: none" class="search_no_results"><?= $block->getSearchNoResultsText(); ?></div>
+            placeholder="<?= $escaper->escapeHtmlAttr($block->getSearchPlaceholder()); ?>" >
+        <div style="display: none" class="search_no_results"><?= $escaper->escapeHtml($block->getSearchNoResultsText()); ?></div>
     <?php endif; ?>
     <ol class="items">
         <?php foreach ($block->getItems() as $index => $item): ?>
@@ -61,9 +61,9 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
                             <?=htmlentities($item->getCount())?>
                             <span class="filter-count-label">
                                 <?php if ($item->getCount() === 1):?>
-                                    <?=__('item')?>
+                                    <?=$escaper->escapeHtml(__('item'))?>
                                 <?php else:?>
-                                    <?=__('items')?>
+                                    <?=$escaper->escapeHtml(__('items'))?>
                                 <?php endif;?>
                             </span>
                         </span>
@@ -74,7 +74,7 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
     </ol>
 
     <?php if ($hasHiddenItems): ?>
-        <a class="more-items"><?=__($block->getMoreItemText())?></a>
-        <a class="less-items default-hidden"><?=__($block->getLessItemText())?></a>
+        <a class="more-items"><?=$escaper->escapeHtml(__($block->getMoreItemText()))?></a>
+        <a class="less-items default-hidden"><?=$escaper->escapeHtml(__($block->getLessItemText()))?></a>
     <?php endif; ?>
 </div>
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 68ce8ced..831ca45a 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -23,7 +23,7 @@ $currentMaxValue = $block->getCurrentMaxValue();
 $sliderUrlInputValue = sprintf('%s-%s', $currentMinValue, $currentMaxValue);
 $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
 ?>
-<div class="slider-attribute" id="attribute-slider-<?=$block->getCssId()?>">
+<div class="slider-attribute" id="attribute-slider-<?=$escaper->escapeHtmlAttr($block->getCssId())?>">
     <div class="labels">
         <span class="min-value">
             <span class="prefix"><?= $itemPrefix ?></span>
diff --git a/view/frontend/templates/searchbanner/search.banner.phtml b/view/frontend/templates/searchbanner/search.banner.phtml
index 61e4c61d..dff26abc 100644
--- a/view/frontend/templates/searchbanner/search.banner.phtml
+++ b/view/frontend/templates/searchbanner/search.banner.phtml
@@ -1,10 +1,15 @@
 <?php
 
+use Magento\Framework\Escaper;
+
 /** @var array $banners  */
+/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
+
 $banners = $block->getData('banners');
-$styling = ($banners[0]['location'] == 'ContainerTop') ? 'style="margin-right: auto; margin-left: auto;"' : '';
+$styling = ($banners[0]['location'] == 'ContainerTop') ? 'margin-right: auto; margin-left: auto;' : '';
 ?>
-<div class="searchbanners" <?=  $styling ?>>
+<div class="searchbanners" style="<?= $escaper->escapeHtmlAttr($styling) ?>">
     <?php foreach ($banners as $banner): ?>
         <?php if (!empty($banner['clickurl'])): ?>
             <a href="<?= $escaper->escapeUrl($banner['clickurl']); ?>" type="<?= $escaper->escapeHtmlAttr($banner['clicktarget']); ?>">

From 22f3a084c0aedbb7a79a99e0f233e8cfcddb4d6a Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:50:33 +0200
Subject: [PATCH 12/23] Wip

---
 view/frontend/templates/layer/view.phtml      | 18 +++----
 .../templates/product/layered/default.phtml   | 10 ++--
 .../templates/product/layered/link/item.phtml | 12 ++---
 .../templates/product/layered/slider.phtml    | 48 +++++++++----------
 .../templates/product/layered/tree.phtml      |  2 +-
 .../templates/product/layered/tree/item.phtml | 14 +++---
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index b9c6b076..e8a52adf 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -41,7 +41,7 @@ if (!$block->canShowBlock()) {
         <strong data-role="title"><?=$escaper->escapeHtml(__('Shop By'))?></strong>
     </div>
     <div class="block-content filter-content">
-        <form id="facet-filter-form" <?=($jsFormConfig ? sprintf('data-mage-init=\'%s\'', $jsFormConfig) : '')?>>
+        <form id="facet-filter-form" <?= $escaper->escapeHtmlAttr($jsFormConfig ? sprintf('data-mage-init=\'%s\'', $jsFormConfig) : '')?>>
         <?=$block->getChildHtml('state');?>
 
         <?php if ($block->getLayer()->getState()->getFilters()): ?>
@@ -57,34 +57,34 @@ if (!$block->canShowBlock()) {
             <strong
                 role="heading"
                 aria-level="2"
-                class="block-subtitle filter-subtitle"><?=__('Shopping Options') ?>
+                class="block-subtitle filter-subtitle"><?=$escaper->escapeHtml(__('Shopping Options')) ?>
             </strong>
             <div class="filter-options" id="narrow-by-list" data-role="content">
                 <?php foreach ($tweakwiseNavigationConfig->getFilterFormInput() as $name => $value):?>
                     <?php // These are tweakwise system parameters which are needed for ajax navigation ?>
-                    <input type="hidden" name="<?=$name?>" value="<?=$value?>">
+                    <input type="hidden" name="<?=$escaper->escapeHtmlAttr($name)?>" value="<?=$escaper->escapeHtmlAttr($value)?>">
                 <?php endforeach;?>
                 <?php foreach ($filters as $filter): ?>
                     <?php if ($filter->isCollapsible()): ?>
                         <?php $filterActive = $filter->isDefaultCollapsed() ? 'false' : '[0]'; ?>
-                        <div class="collapsible-container <?=$filter->getCssClass()?>"
+                        <div class="collapsible-container <?=$escaper->escapeHtmlAttr($filter->getCssClass())?>"
                              data-mage-init='{
                                 "accordion":{
-                                    "openedState": "active", "collapsible": true, "active": <?=$filterActive?>
+                                    "openedState": "active", "collapsible": true, "active": <?=$escaper->escapeHtmlAttr($filterActive)?>
                                 }
                             }'>
                             <div data-role="collapsible" class="filter-options-item">
                                 <div data-role="title" class="filter-options-title">
-                                    <?=__($filter->getName())?>
+                                    <?=$escaper->escapeHtml(__($filter->getName()))?>
                                     <?php $tooltip = $filter->getTooltip(); ?>
                                     <?php if ($tooltip): ?>
-                                        <span class="tooltip" data-tooltip="<?=$tooltip?>"><span>i</span></span>
+                                        <span class="tooltip" data-tooltip="<?=$escaper->escapeHtmlAttr($tooltip)?>"><span>i</span></span>
                                     <?php endif; ?>
                                 </div>
                                 <?php
-                                    $filterContentStyle = $filter->isDefaultCollapsed() ? ' style="display: none;"' : ''
+                                    $filterContentStyle = $filter->isDefaultCollapsed() ? 'display: none;' : ''
                                 ?>
-                                <div data-role="content" class="filter-options-content"<?=$filterContentStyle?>>
+                                <div data-role="content" class="filter-options-content" style="<?= $escaper->escapeHtmlAttr($filterContentStyle)?>">
                                     <?=$block->getChildBlock('renderer')->render($filter) ?>
                                 </div>
                             </div>
diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index e7573a4d..5b85f4c4 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -36,15 +36,15 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
         <?php foreach ($block->getItems() as $index => $item): ?>
             <li class="item<?=$block->itemDefaultHidden($item) ? ' default-hidden' : ''?>"
                 <?php if ($hasHiddenItems && $hasAlternateSortOrder):?>
-                    data-alternate-sort="<?=$item->getAlternateSortOrder();?>"
-                    data-original-sort="<?=$index;?>"
+                    data-alternate-sort="<?=$escaper->escapeHtmlAttr($item->getAlternateSortOrder());?>"
+                    data-original-sort="<?=$escaper->escapeHtmlAttr($index);?>"
                 <?php endif;?>
             >
                 <a <?=$block->renderAnchorHtmlTagAttributes($item);?>>
                     <?php $cssId = $item->getCssId();?>
                     <?php if ($showCheckBox): ?>
-                        <input id="<?=$cssId?>"
-                               name="<?=$item->getFilter()->getFacet()->getFacetSettings()->getUrlKey()?>[]"
+                        <input id="<?=$escaper->escapeHtmlAttr($cssId)?>"
+                               name="<?=$escaper->escapeHtmlAttr($item->getFilter()->getFacet()->getFacetSettings()->getUrlKey())?>[]"
                                type="checkbox" <?=($item->isSelected() ? 'checked="checked"' : '')?>
                                value="<?=$escaper->escapeHtmlAttr($item->getLabel())?>"
                         >
@@ -58,7 +58,7 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
 
                     <?php if ($shouldDisplayProductCountLayer): ?>
                         <span class="count">
-                            <?=htmlentities($item->getCount())?>
+                            <?= $escaper->escapeHtml($item->getCount())?>
                             <span class="filter-count-label">
                                 <?php if ($item->getCount() === 1):?>
                                     <?=$escaper->escapeHtml(__('item'))?>
diff --git a/view/frontend/templates/product/layered/link/item.phtml b/view/frontend/templates/product/layered/link/item.phtml
index 8b3f3769..573af150 100644
--- a/view/frontend/templates/product/layered/link/item.phtml
+++ b/view/frontend/templates/product/layered/link/item.phtml
@@ -22,19 +22,19 @@ $hasAlternateSortOrder = $block->hasAlternateSortOrder();
         data-alternate-sort="<?=$item->getAlternateSortOrder();?>"
     <?php endif;?>
 >
-    <a href="<?=$block->getCategoryUrl($item)?>">
-        <?=$block->getItemPrefix()?>
+    <a href="<?=$escaper->escapeUrl($block->getCategoryUrl($item))?>">
+        <?=$escaper->escapeHtmlAttr($block->getItemPrefix())?>
         <?=$escaper->escapeHtml($item->getLabel())?>
-        <?=$block->getItemPostfix()?>
+        <?=$escaper->escapeHtmlAttr($block->getItemPostfix())?>
 
         <?php if ($block->shouldDisplayProductCountOnLayer()): ?>
             <span class="count">
-                <?=htmlentities($item->getCount())?>
+                <?=$escaper->escapeHtml($item->getCount())?>
                 <span class="filter-count-label">
                     <?php if ($item->getCount() == 1):?>
-                        <?=__('item')?>
+                        <?=$escaper->escapeHtml(__('item'))?>
                     <?php else:?>
-                        <?=__('items')?>
+                        <?=$escaper->escapeHtml(__('items'))?>
                     <?php endif;?>
                 </span>
             </span>
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 831ca45a..7095c8c7 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -26,57 +26,57 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
 <div class="slider-attribute" id="attribute-slider-<?=$escaper->escapeHtmlAttr($block->getCssId())?>">
     <div class="labels">
         <span class="min-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?=$block->renderValue($minValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
+            <span class="prefix"><?= $escaper->escapeHtml($itemPrefix) ?></span>
+            <?= $escaper->escapeHtml($block->renderValue($minValue))?>
+            <span class="postfix"><?= $escaper->escapeHtml($itemPostfix) ?></span>
         </span>
         <span class="max-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?=$block->renderValue($maxValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
+            <span class="prefix"><?= $escaper->escapeHtml($itemPrefix) ?></span>
+            <?= $escaper->escapeHtml($block->renderValue($maxValue))?>
+            <span class="postfix"><?= $escaper->escapeHtml($itemPostfix) ?></span>
         </span>
     </div>
     <div class="slider" data-mage-init="<?=$escaper->escapeHtmlAttr($block->getJsSliderConfig())?>"></div>
     <div class="labels">
         <span class="current-min-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?= $block->renderValue($currentMinValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
+            <span class="prefix"><?= $escaper->escapeHtml($itemPrefix) ?></span>
+            <?= $escaper->escapeHtml($block->renderValue($currentMinValue))?>
+            <span class="postfix"><?= $escaper->escapeHtml($itemPostfix) ?></span>
         </span>
         <span class="current-max-value">
-            <span class="prefix"><?= $itemPrefix ?></span>
-            <?=$block->renderValue($currentMaxValue)?>
-            <span class="postfix"><?= $itemPostfix ?></span>
+            <span class="prefix"><?= $escaper->escapeHtml($itemPrefix) ?></span>
+            <?= $escaper->escapeHtml($block->renderValue($currentMaxValue))?>
+            <span class="postfix"><?= $escaper->escapeHtml($itemPostfix) ?></span>
         </span>
     </div>
     <div class="slider-inputs">
         <div class="slider-min-wrapper">
-            <label for="<?= $urlKey ?>-min"><?=__('From')?></label>
+            <label for="<?= $escaper->escapeUrl($urlKey) ?>-min"><?= $escaper->escapeHtml(__('From'))?></label>
             <input type="text"
                    class="slider-min js-skip-submit"
-                   id="<?= $urlKey ?>-min"
-                   name="<?= $urlKey ?>-min"
-                   value="<?= $currentMinValue ?>"
+                   id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-min"
+                   name="<?= $escaper->escapeHtmlAttr($urlKey) ?>-min"
+                   value="<?= $escaper->escapeHtmlAttr($currentMinValue) ?>"
             >
         </div>
         <div class="slider-max-wrapper">
-            <label for="<?= $urlKey ?>-max"><?=__('To')?></label>
+            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=__('To')?></label>
             <input type="text"
                    class="slider-max js-skip-submit"
-                   id="<?= $urlKey ?>-max"
-                   name="<?= $urlKey ?>-max"
-                   value="<?= $currentMaxValue ?>"
+                   id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
+                   name="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
+                   value="<?= $escaper->escapeHtmlAttr($currentMaxValue) ?>"
             >
         </div>
         <input type="hidden"
-               data-disabled-input="<?=$disabledSliderUrlInputValue?>"
+               data-disabled-input="<?= $escaper->escapeHtmlAttr($disabledSliderUrlInputValue)?>"
                <?php if ($sliderUrlInputValue === $disabledSliderUrlInputValue):?>
                disabled="disabled"
                <?php endif;?>
-               id="<?=$block->getCssId()?>"
+               id="<?=$escaper->escapeHtmlAttr($block->getCssId())?>"
                class="slider-url-value"
-               name="<?= $urlKey ?>"
-               value="<?=$sliderUrlInputValue?>"
+               name="<?= $escaper->escapeHtmlAttr($urlKey) ?>"
+               value="<?=$escaper->escapeHtmlAttr($sliderUrlInputValue)?>"
         >
     </div>
 </div>
diff --git a/view/frontend/templates/product/layered/tree.phtml b/view/frontend/templates/product/layered/tree.phtml
index d6cc022c..5f4ee659 100644
--- a/view/frontend/templates/product/layered/tree.phtml
+++ b/view/frontend/templates/product/layered/tree.phtml
@@ -16,6 +16,6 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
 ?>
 <ol class="items tree-attribute">
     <?php foreach ($block->getItems() as $item): ?>
-        <?=$block->renderTreeItem($item)?>
+        <?= /* @noEscape */$block->renderTreeItem($item)?>
     <?php endforeach; ?>
 </ol>
diff --git a/view/frontend/templates/product/layered/tree/item.phtml b/view/frontend/templates/product/layered/tree/item.phtml
index b8910ab5..a4b0533d 100644
--- a/view/frontend/templates/product/layered/tree/item.phtml
+++ b/view/frontend/templates/product/layered/tree/item.phtml
@@ -16,19 +16,19 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
 $item = $block->getItem();
 ?>
 <li class="item">
-    <a href="<?=$block->getCategoryUrl($item)?>">
-        <?=$block->getItemPrefix()?>
+    <a href="<?=$escaper->escapeUrl($block->getCategoryUrl($item))?>">
+        <?=$escaper->escapeHtml($block->getItemPrefix())?>
         <?=$escaper->escapeHtml($item->getLabel())?>
-        <?=$block->getItemPostfix()?>
+        <?=$escaper->escapeHtml($block->getItemPostfix())?>
 
         <?php if ($block->shouldDisplayProductCountOnLayer()): ?>
             <span class="count">
-                <?=htmlentities($item->getCount())?>
+                <?= $escaper->escapeHtml($item->getCount())?>
                 <span class="filter-count-label">
                     <?php if ($item->getCount() == 1):?>
-                        <?=__('item')?>
+                        <?= $escaper->escapeHtml(__('item'))?>
                     <?php else:?>
-                        <?=__('items')?>
+                        <?= $escaper->escapeHtml(__('items'))?>
                     <?php endif;?>
                 </span>
             </span>
@@ -38,7 +38,7 @@ $item = $block->getItem();
     <?php if ($block->hasChildren()): ?>
         <ol class="items child-items">
             <?php foreach ($item->getChildren() as $child): ?>
-                <? $block->renderTreeItem($child)?>
+                <? /* @noEscape */$block->renderTreeItem($child)?>
             <?php endforeach; ?>
         </ol>
     <?php endif; ?>

From 19633c868a6da0ddd53ceba0880544a59cb9f0be Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:18:44 +0200
Subject: [PATCH 13/23] Wip

---
 view/frontend/templates/layer/view.phtml      |  8 ++---
 .../templates/product/layered/default.phtml   |  6 ++--
 .../templates/product/layered/link.phtml      |  8 ++---
 .../templates/product/layered/link/item.phtml |  4 +--
 .../templates/product/layered/slider.phtml    |  2 +-
 .../templates/product/layered/tree/item.phtml |  2 +-
 view/frontend/templates/product/list.phtml    |  2 +-
 .../templates/product/list/item.phtml         | 36 +++++++++----------
 .../templates/product/list/items.phtml        |  8 ++---
 .../templates/product/list/linked-item.phtml  | 10 +++---
 10 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index e8a52adf..1e73b60a 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -85,24 +85,24 @@ if (!$block->canShowBlock()) {
                                     $filterContentStyle = $filter->isDefaultCollapsed() ? 'display: none;' : ''
                                 ?>
                                 <div data-role="content" class="filter-options-content" style="<?= $escaper->escapeHtmlAttr($filterContentStyle)?>">
-                                    <?=$block->getChildBlock('renderer')->render($filter) ?>
+                                    <?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?>
                                 </div>
                             </div>
                         </div>
                     <?php else: ?>
                         <div class="filter-options-item">
                             <div class="filter-options-title filter-options-title-non-collapsible">
-                                <?=__($filter->getName())?>
+                                <?=$escaper->escapeHtml(__($filter->getName()))?>
                             </div>
                             <div class="filter-options-content">
-                                <?=$block->getChildBlock('renderer')->render($filter) ?>
+                                <?= /* @noEscape */$block->getChildBlock('renderer')->render($filter) ?>
                             </div>
                         </div>
                     <?php endif; ?>
                     <?php if ($renderFilterButton): ?>
                         <div class="show-items-link">
                             <button type="button" class="btn btn-primary btn-block js-btn-filter">
-                                <?=__(sprintf('Show <span>%s</span> items', $block->getLayer()->getProductCount())); ?>
+                                <?= $escaper->escapeHtml(__(sprintf('Show <span>%s</span> items', $block->getLayer()->getProductCount()))); ?>
                             </button>
                         </div>
                     <?php endif;?>
diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index 5b85f4c4..4197f719 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -49,11 +49,11 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
                                value="<?=$escaper->escapeHtmlAttr($item->getLabel())?>"
                         >
 
-                        <label for="<?=$cssId?>">
-                            <?=$prefix . $escaper->escapeHtml($item->getLabel()) . $postfix?>
+                        <label for="<?= $escaper->escapeHtmlAttr($cssId)?>">
+                            <?=$escaper->escapeHtml($prefix . $item->getLabel() . $postfix)?>
                         </label>
                     <?php else: ?>
-                        <?=$prefix . $escaper->escapeHtml($item->getLabel()) . $postfix?>
+                        <?= $escaper->escapeHtml($prefix . $item->getLabel()) . $postfix)?>
                     <?php endif; ?>
 
                     <?php if ($shouldDisplayProductCountLayer): ?>
diff --git a/view/frontend/templates/product/layered/link.phtml b/view/frontend/templates/product/layered/link.phtml
index bb99df29..f77c787c 100644
--- a/view/frontend/templates/product/layered/link.phtml
+++ b/view/frontend/templates/product/layered/link.phtml
@@ -15,16 +15,16 @@ use Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\RenderLayered\TreeRender
  */
 $hasHiddenItems = $block->hasHiddenItems();
 ?>
-<div data-mage-init='<?=$block->getJsSortConfig()?>'>
+<div data-mage-init='<?= $escaper->escapeHtmlAttr($block->getJsSortConfig())?>'>
     <ol class="items link-attribute">
         <?php foreach ($block->getItems() as $item): ?>
-            <?=$block->renderLinkItem($item)?>
+            <?= /* @noEscape */$block->renderLinkItem($item)?>
         <?php endforeach; ?>
     </ol>
 
     <?php if ($hasHiddenItems): ?>
-        <a class="more-items"><?=__($block->getMoreItemText())?></a>
-        <a class="less-items default-hidden"><?=__($block->getLessItemText())?></a>
+        <a class="more-items"><?=$escaper->escapeHtml(__($block->getMoreItemText()))?></a>
+        <a class="less-items default-hidden"><?=$escaper->escapeHtml(__($block->getLessItemText()))?></a>
     <?php endif; ?>
 </div>
 
diff --git a/view/frontend/templates/product/layered/link/item.phtml b/view/frontend/templates/product/layered/link/item.phtml
index 573af150..0a69afb2 100644
--- a/view/frontend/templates/product/layered/link/item.phtml
+++ b/view/frontend/templates/product/layered/link/item.phtml
@@ -19,7 +19,7 @@ $hasAlternateSortOrder = $block->hasAlternateSortOrder();
 ?>
 <li class="item<?=$block->itemDefaultHidden($item) ? ' default-hidden' : ''?>"
     <?php if ($hasHiddenItems && $hasAlternateSortOrder):?>
-        data-alternate-sort="<?=$item->getAlternateSortOrder();?>"
+        data-alternate-sort="<?= $escaper->escapeHtmlAttr($item->getAlternateSortOrder());?>"
     <?php endif;?>
 >
     <a href="<?=$escaper->escapeUrl($block->getCategoryUrl($item))?>">
@@ -44,7 +44,7 @@ $hasAlternateSortOrder = $block->hasAlternateSortOrder();
     <?php if ($block->hasChildren()): ?>
         <ol class="items child-items">
             <?php foreach ($block->getChildren() as $child): ?>
-                <?=$block->renderLinkItem($child)?>
+                <?= /* @noEscape */$block->renderLinkItem($child)?>
             <?php endforeach; ?>
         </ol>
     <?php endif; ?>
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 7095c8c7..22db3d72 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -60,7 +60,7 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
             >
         </div>
         <div class="slider-max-wrapper">
-            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=__('To')?></label>
+            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=$escaper->escapeHtml(__('To'))?></label>
             <input type="text"
                    class="slider-max js-skip-submit"
                    id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
diff --git a/view/frontend/templates/product/layered/tree/item.phtml b/view/frontend/templates/product/layered/tree/item.phtml
index a4b0533d..06273d79 100644
--- a/view/frontend/templates/product/layered/tree/item.phtml
+++ b/view/frontend/templates/product/layered/tree/item.phtml
@@ -38,7 +38,7 @@ $item = $block->getItem();
     <?php if ($block->hasChildren()): ?>
         <ol class="items child-items">
             <?php foreach ($item->getChildren() as $child): ?>
-                <? /* @noEscape */$block->renderTreeItem($child)?>
+                <?php /* @noEscape */$block->renderTreeItem($child)?>
             <?php endforeach; ?>
         </ol>
     <?php endif; ?>
diff --git a/view/frontend/templates/product/list.phtml b/view/frontend/templates/product/list.phtml
index 7fbcdfd2..0e363e92 100644
--- a/view/frontend/templates/product/list.phtml
+++ b/view/frontend/templates/product/list.phtml
@@ -46,7 +46,7 @@ $productListItemViewModel = $block->getData('view_model_product_list_item');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?=  $viewMode ?> products-<?=  $viewMode ?>">
+    <div class="products wrapper <?=  $escaper->escapeHtmlAttr($viewMode) ?> products-<?=  $escaper->escapeHtmlAttr($viewMode) ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
diff --git a/view/frontend/templates/product/list/item.phtml b/view/frontend/templates/product/list/item.phtml
index d74f3308..456af7dc 100644
--- a/view/frontend/templates/product/list/item.phtml
+++ b/view/frontend/templates/product/list/item.phtml
@@ -27,8 +27,8 @@ $showDescription = $block->getData('show_description');
 ?>
 <li class="item product product-item">
     <div class="product-item-info"
-         id="product-item-info_<?=  $_product->getId() ?>"
-         data-container="product-<?=  $viewMode ?>">
+         id="product-item-info_<?=  $escaper->escapeHtmlAttr($_product->getId()) ?>"
+         data-container="product-<?=  $escaper->escapeHtmlAttr($viewMode) ?>">
         <?php
         $productImage = $block->getImage($_product, $imageDisplayArea);
         if ($pos != null) {
@@ -47,13 +47,13 @@ $showDescription = $block->getData('show_description');
             <strong class="product name product-item-name">
                 <a class="product-item-link"
                    href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
-                    <?= $_helper->productAttribute($_product, $_product->getName(), 'name')?>
+                    <?= $escaper->escapeHtml($_helper->productAttribute($_product, $_product->getName(), 'name'))?>
                 </a>
             </strong>
-            <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
-            <?=  $block->getProductPrice($_product) ?>
+            <?= /* @noEscape */$block->getReviewsSummaryHtml($_product, $templateType) ?>
+            <?=  $escaper->escapeHtml($block->getProductPrice($_product)) ?>
 
-            <?= $block->getProductDetailsHtml($_product) ?>
+            <?= /* @noEscape */$block->getProductDetailsHtml($_product) ?>
 
             <div class="product-item-inner">
                 <div class="product actions product-item-actions">
@@ -61,7 +61,7 @@ $showDescription = $block->getData('show_description');
                         <?php if ($_product->isSaleable()):?>
                             <?php $postParams = $parentBlock->getAddToCartPostParams($_product); ?>
                             <form data-role="tocart-form"
-                                  data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
+                                  data-product-sku="<?= $escaper->escapeHtmlAttr($_product->getSku()) ?>"
                                   action="<?= $escaper->escapeUrl($postParams['action']) ?>"
                                   data-mage-init='{"catalogAddToCart": {}}'
                                   method="post">
@@ -69,16 +69,16 @@ $showDescription = $block->getData('show_description');
                                 <?php $options = $viewModel ? $viewModel->getOptionsData($_product) : []; ?>
                                 <?php foreach ($options as $optionItem): ?>
                                     <input type="hidden"
-                                           name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
-                                           value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
+                                           name="<?= $escaper->escapeHtmlAttr($optionItem['name']) ?>"
+                                           value="<?= $escaper->escapeHtmlAttr($optionItem['value']) ?>">
                                 <?php endforeach; ?>
                                 <input type="hidden"
                                        name="product"
-                                       value="<?=  $postParams['data']['product'] ?>">
+                                       value="<?= $escaper->escapeHtmlAttr($postParams['data']['product']) ?>">
                                 <input type="hidden"
-                                       name="<?=  Action::PARAM_NAME_URL_ENCODED ?>"
+                                       name="<?=  $escaper->escapeHtmlAttr(Action::PARAM_NAME_URL_ENCODED) ?>"
                                        value="<?=
-                                        $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
+                                        $escaper->escapeHtmlAttr($postParams['data'][Action::PARAM_NAME_URL_ENCODED])
                                         ?>">
                                 <?= $block->getBlockHtml('formkey') ?>
                                 <button type="submit"
@@ -99,7 +99,7 @@ $showDescription = $block->getData('show_description');
                         <?php endif; ?>
                     </div>
                     <?= ($pos && strpos($pos, $viewMode . '-primary')) ?
-                         $secureRenderer->renderStyleAsTag(
+                         /* @noEscape */$secureRenderer->renderStyleAsTag(
                             $position,
                             'product-item-info_' . $_product->getId() . ' div.actions-primary'
                         ) : '' ?>
@@ -109,28 +109,28 @@ $showDescription = $block->getData('show_description');
                         <?php endif; ?>
                     </div>
                     <?= ($pos && strpos($pos, $viewMode . '-secondary')) ?
-                         $secureRenderer->renderStyleAsTag(
+                         /* @noEscape */$secureRenderer->renderStyleAsTag(
                             $position,
                             'product-item-info_' . $_product->getId() . ' div.actions-secondary'
                         ) : '' ?>
                 </div>
                 <?php if ($showDescription): ?>
                     <div class="product description product-item-description">
-                        <?=  $_helper->productAttribute(
+                        <?=  /* @noEscape */ $_helper->productAttribute(
                             $_product,
                             $_product->getShortDescription(),
                             'short_description'
                         ) ?>
                         <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
-                           title="<?=  $_productNameStripped ?>"
-                           class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
+                           title="<?=  $escaper->escapeHtmlAttr($_productNameStripped) ?>"
+                           class="action more"><?= $escaper->escapeHtmlAttr(__('Learn More')) ?></a>
                     </div>
                 <?php endif; ?>
             </div>
         </div>
     </div>
     <?= ($pos && strpos($pos, $viewMode . '-actions')) ?
-         $secureRenderer->renderStyleAsTag(
+         /* @noEscape */$secureRenderer->renderStyleAsTag(
             $position,
             'product-item-info_' . $_product->getId() . ' div.product-item-actions'
         ) : '' ?>
diff --git a/view/frontend/templates/product/list/items.phtml b/view/frontend/templates/product/list/items.phtml
index 536230d3..36d66a99 100644
--- a/view/frontend/templates/product/list/items.phtml
+++ b/view/frontend/templates/product/list/items.phtml
@@ -167,14 +167,14 @@ $linkedProductListItemViewModel = $block->getData('view_model_linked_product_lis
 <div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
      data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}'
      data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
-     data-shuffle="<?=  $shuffle ?>"
-     data-shuffle-weighted="<?=  $isWeightedRandom ?>">
+     data-shuffle="<?=  $escaper->escapeHtmlAttr($shuffle) ?>"
+     data-shuffle-weighted="<?= $escaper->escapeHtmlAttr($isWeightedRandom) ?>">
     <?php else:?>
     <div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
          data-mage-init='{"upsellProducts":{}}'
          data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
-         data-shuffle="<?=  $shuffle ?>"
-         data-shuffle-weighted="<?=  $isWeightedRandom ?>">
+         data-shuffle="<?= $escaper->escapeHtmlAttr($shuffle) ?>"
+         data-shuffle-weighted="<?= $escaper->escapeHtmlAttr($isWeightedRandom) ?>">
         <?php endif; ?>
         <?php else:?>
         <div class="block <?= $escaper->escapeHtmlAttr($class) ?>">
diff --git a/view/frontend/templates/product/list/linked-item.phtml b/view/frontend/templates/product/list/linked-item.phtml
index b0bc6442..c61ccb92 100644
--- a/view/frontend/templates/product/list/linked-item.phtml
+++ b/view/frontend/templates/product/list/linked-item.phtml
@@ -33,17 +33,17 @@ $parentBlock = $block->getData('parent_block');
 <?php endif; ?>
 <?php if ($type == 'related' || $type == 'upsell'):?>
     <li class="item product product-item"
-    id="product-item_<?=  $_item->getId() ?>"
+    id="product-item_<?= $escaper->escapeHtmlAttr($_item->getId()) ?>"
     data-shuffle-group="<?= $parentBlock->escapeHtmlAttr($_item->getPriority()) ?>" >
-    <?=  $secureRenderer->renderStyleAsTag(
+    <?= /* @noEscape */$secureRenderer->renderStyleAsTag(
         'display:none;',
         'li#product-item_' . $_item->getId()
     ) ?>
 <?php else:?>
     <li class="item product product-item">
 <?php endif; ?>
-<div class="product-item-info <?=  $available ?>">
-    <?=  '<!-- ' . $image . '-->' ?>
+<div class="product-item-info <?= $escaper->escapeHtmlAttr($available) ?>">
+    <?=  '<!-- ' . $escaper->escapeHtmlAttr($image) . '-->' ?>
     <a href="<?= $parentBlock->escapeUrl($parentBlock->getProductUrl($_item)) ?>"
        class="product photo product-item-photo">
         <?= $parentBlock->getImage($_item, $image)->toHtml() ?>
@@ -56,7 +56,7 @@ $parentBlock = $block->getData('parent_block');
                 <?= $parentBlock->escapeHtml($_item->getName()) ?></a>
         </strong>
 
-        <?=  $parentBlock->getProductPrice($_item) ?>
+        <?=  $escaper->escapeHtml($parentBlock->getProductPrice($_item)) ?>
 
         <?php if ($templateType):?>
             <?= $parentBlock->getReviewsSummaryHtml($_item, $templateType) ?>

From ef0d330211ce941f0d770a4858dae8a9f6a5a13d Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:20:53 +0200
Subject: [PATCH 14/23] Wip

---
 view/frontend/templates/product/layered/default.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/templates/product/layered/default.phtml b/view/frontend/templates/product/layered/default.phtml
index 4197f719..6019e997 100644
--- a/view/frontend/templates/product/layered/default.phtml
+++ b/view/frontend/templates/product/layered/default.phtml
@@ -53,7 +53,7 @@ $shouldDisplayProductCountLayer = $block->shouldDisplayProductCountOnLayer();
                             <?=$escaper->escapeHtml($prefix . $item->getLabel() . $postfix)?>
                         </label>
                     <?php else: ?>
-                        <?= $escaper->escapeHtml($prefix . $item->getLabel()) . $postfix)?>
+                        <?= $escaper->escapeHtml($prefix . $item->getLabel() . $postfix)?>
                     <?php endif; ?>
 
                     <?php if ($shouldDisplayProductCountLayer): ?>

From 0083c6846e22f12e482f4a46bee85f788a3659e1 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:59:08 +0200
Subject: [PATCH 15/23] Fix filters

---
 view/frontend/templates/form.mini.phtml          |  2 +-
 view/frontend/templates/layer/view.phtml         |  2 +-
 .../templates/product/layered/slider.phtml       | 16 ++++++++--------
 view/frontend/templates/product/list/item.phtml  |  2 +-
 .../templates/product/list/linked-item.phtml     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/view/frontend/templates/form.mini.phtml b/view/frontend/templates/form.mini.phtml
index c903ba0c..660a97ec 100644
--- a/view/frontend/templates/form.mini.phtml
+++ b/view/frontend/templates/form.mini.phtml
@@ -87,7 +87,7 @@ use Magento\Framework\Escaper;
 <script type="text/javascript">
     require(['Magento_Catalog/js/price-utils'], function(priceUtils){
         window['autocompleteFormatPrice'] = function(price) {
-            return priceUtils.formatPrice(price, <?=$escaper->escapeJs($block->getJsonPriceFormat())?>);
+            return priceUtils.formatPrice(price, <?= /* @noEscape */($block->getJsonPriceFormat())?>);
         };
     });
 </script>
diff --git a/view/frontend/templates/layer/view.phtml b/view/frontend/templates/layer/view.phtml
index 1e73b60a..3f8a55f9 100644
--- a/view/frontend/templates/layer/view.phtml
+++ b/view/frontend/templates/layer/view.phtml
@@ -41,7 +41,7 @@ if (!$block->canShowBlock()) {
         <strong data-role="title"><?=$escaper->escapeHtml(__('Shop By'))?></strong>
     </div>
     <div class="block-content filter-content">
-        <form id="facet-filter-form" <?= $escaper->escapeHtmlAttr($jsFormConfig ? sprintf('data-mage-init=\'%s\'', $jsFormConfig) : '')?>>
+        <form id="facet-filter-form" <?= /* @noEscape */ $jsFormConfig ? sprintf('data-mage-init=\'%s\'', $jsFormConfig) : ''?>>
         <?=$block->getChildHtml('state');?>
 
         <?php if ($block->getLayer()->getState()->getFilters()): ?>
diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 22db3d72..41a9fd81 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -60,23 +60,23 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
             >
         </div>
         <div class="slider-max-wrapper">
-            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=$escaper->escapeHtml(__('To'))?></label>
+            <label for="<?= $urlKey ?>-max"><?=__('To')?></label>
             <input type="text"
                    class="slider-max js-skip-submit"
-                   id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
-                   name="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
-                   value="<?= $escaper->escapeHtmlAttr($currentMaxValue) ?>"
+                   id="<?= $urlKey ?>-max"
+                   name="<?= $urlKey ?>-max"
+                   value="<?= $currentMaxValue ?>"
             >
         </div>
         <input type="hidden"
-               data-disabled-input="<?= $escaper->escapeHtmlAttr($disabledSliderUrlInputValue)?>"
+               data-disabled-input="<?=$disabledSliderUrlInputValue?>"
                <?php if ($sliderUrlInputValue === $disabledSliderUrlInputValue):?>
                disabled="disabled"
                <?php endif;?>
-               id="<?=$escaper->escapeHtmlAttr($block->getCssId())?>"
+               id="<?=$block->getCssId()?>"
                class="slider-url-value"
-               name="<?= $escaper->escapeHtmlAttr($urlKey) ?>"
-               value="<?=$escaper->escapeHtmlAttr($sliderUrlInputValue)?>"
+               name="<?= $urlKey ?>"
+               value="<?=$sliderUrlInputValue?>"
         >
     </div>
 </div>
diff --git a/view/frontend/templates/product/list/item.phtml b/view/frontend/templates/product/list/item.phtml
index 456af7dc..bc5a1264 100644
--- a/view/frontend/templates/product/list/item.phtml
+++ b/view/frontend/templates/product/list/item.phtml
@@ -51,7 +51,7 @@ $showDescription = $block->getData('show_description');
                 </a>
             </strong>
             <?= /* @noEscape */$block->getReviewsSummaryHtml($_product, $templateType) ?>
-            <?=  $escaper->escapeHtml($block->getProductPrice($_product)) ?>
+            <?= /* @noEscape */$block->getProductPrice($_product) ?>
 
             <?= /* @noEscape */$block->getProductDetailsHtml($_product) ?>
 
diff --git a/view/frontend/templates/product/list/linked-item.phtml b/view/frontend/templates/product/list/linked-item.phtml
index c61ccb92..8203c71f 100644
--- a/view/frontend/templates/product/list/linked-item.phtml
+++ b/view/frontend/templates/product/list/linked-item.phtml
@@ -56,7 +56,7 @@ $parentBlock = $block->getData('parent_block');
                 <?= $parentBlock->escapeHtml($_item->getName()) ?></a>
         </strong>
 
-        <?=  $escaper->escapeHtml($parentBlock->getProductPrice($_item)) ?>
+        <?=  /* @noEscape */$parentBlock->getProductPrice($_item) ?>
 
         <?php if ($templateType):?>
             <?= $parentBlock->getReviewsSummaryHtml($_item, $templateType) ?>

From 36b14252e8fd7af1768f5a01fa41a53594981847 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:05:51 +0200
Subject: [PATCH 16/23] Escape slider

---
 .../templates/product/layered/slider.phtml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 41a9fd81..7095c8c7 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -60,23 +60,23 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
             >
         </div>
         <div class="slider-max-wrapper">
-            <label for="<?= $urlKey ?>-max"><?=__('To')?></label>
+            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=__('To')?></label>
             <input type="text"
                    class="slider-max js-skip-submit"
-                   id="<?= $urlKey ?>-max"
-                   name="<?= $urlKey ?>-max"
-                   value="<?= $currentMaxValue ?>"
+                   id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
+                   name="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"
+                   value="<?= $escaper->escapeHtmlAttr($currentMaxValue) ?>"
             >
         </div>
         <input type="hidden"
-               data-disabled-input="<?=$disabledSliderUrlInputValue?>"
+               data-disabled-input="<?= $escaper->escapeHtmlAttr($disabledSliderUrlInputValue)?>"
                <?php if ($sliderUrlInputValue === $disabledSliderUrlInputValue):?>
                disabled="disabled"
                <?php endif;?>
-               id="<?=$block->getCssId()?>"
+               id="<?=$escaper->escapeHtmlAttr($block->getCssId())?>"
                class="slider-url-value"
-               name="<?= $urlKey ?>"
-               value="<?=$sliderUrlInputValue?>"
+               name="<?= $escaper->escapeHtmlAttr($urlKey) ?>"
+               value="<?=$escaper->escapeHtmlAttr($sliderUrlInputValue)?>"
         >
     </div>
 </div>

From 8ec88d1f3eb7b435d61301130cf8ea9eec34b839 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:39:16 +0200
Subject: [PATCH 17/23] fix: change cron group

---
 etc/crontab.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/crontab.xml b/etc/crontab.xml
index 0981459b..33de57aa 100644
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -8,7 +8,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
-    <group id="default">
+    <group id="tweakwise">
         <job name="Tweakwise_Magento2Tweakwise_version" instance="Tweakwise\Magento2Tweakwise\Cron\Version" method="execute">
             <!-- once every day at midnight-->
             <schedule>0 0 * * *</schedule>

From 5ca9143defb76416043c106da186485c61f19f29 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:44:19 +0200
Subject: [PATCH 18/23] feat: tweakwise header source

---
 Model/Client.php |  3 ++-
 Model/Config.php | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Model/Client.php b/Model/Client.php
index 4e0c46d3..6c3bcedf 100644
--- a/Model/Client.php
+++ b/Model/Client.php
@@ -96,7 +96,8 @@ protected function getClient(): HttpClient
                 RequestOptions::TIMEOUT => self::REQUEST_TIMEOUT,
                 RequestOptions::HEADERS => [
                     'user-agent' => $this->config->getUserAgentString(),
-                    'Accept-Encoding' => 'gzip, deflate'
+                    'Accept-Encoding' => 'gzip, deflate',
+                    'TWN-Source' => $this->config->getModuleVersion(),
                 ]
             ];
             $this->client = new HttpClient($options);
diff --git a/Model/Config.php b/Model/Config.php
index f356aac4..797b8cc5 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -21,6 +21,7 @@
 use Magento\Store\Model\Store;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\Composer\ComposerInformation;
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -128,7 +129,8 @@ public function __construct(
         RequestInterface $request,
         State $state,
         WriterInterface $configWriter,
-        TypeListInterface $cacheTypeList
+        TypeListInterface $cacheTypeList,
+        private readonly ComposerInformation $composerInformation
     ) {
         $this->config = $config;
         $this->jsonSerializer = $jsonSerializer;
@@ -638,4 +640,17 @@ public function getProductCardLifetime(): int
     {
         return (int) $this->config->getValue(self::PRODUCT_CARD_LIFETIME_XML_PATH, ScopeInterface::SCOPE_STORE);
     }
+    public function getModuleVersion(): string
+    {
+        $installedPackages = $this->composerInformation
+            ->getInstalledMagentoPackages();
+        if (!isset($installedPackages['tweakwise/magento2-tweakwise']['version'])) {
+            // This should never be the case
+            return '';
+        }
+
+        $version = $installedPackages['tweakwise/magento2-tweakwise']['version'];
+
+        return sprintf('Magento2Tweakwise %s', $version);
+    }
 }

From f18d4748c89796f3f90379d912bc837a07deac6e Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 11 Oct 2024 09:14:25 +0200
Subject: [PATCH 19/23] Fix style

---
 Model/Config.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Model/Config.php b/Model/Config.php
index 797b8cc5..6e96aa38 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -121,6 +121,7 @@ class Config
      * @param State $state
      * @param WriterInterface $configWriter
      * @param TypeListInterface $cacheTypeList
+     * @param ComposerInformation $composerInformation
      * @throws LocalizedException
      */
     public function __construct(
@@ -640,6 +641,10 @@ public function getProductCardLifetime(): int
     {
         return (int) $this->config->getValue(self::PRODUCT_CARD_LIFETIME_XML_PATH, ScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * @return string
+     */
     public function getModuleVersion(): string
     {
         $installedPackages = $this->composerInformation

From 67faa464ccbc1d4c75848f2d8dd58476f423b753 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 11 Oct 2024 09:50:44 +0200
Subject: [PATCH 20/23] Minor fixes

---
 view/frontend/templates/product/layered/slider.phtml | 4 ++++
 view/frontend/web/js/navigation-slider-widget.js     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 33d0a5cf..72fbb4c2 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -151,6 +151,10 @@ $clickpointCounter = 0;
         width: calc(100% - 20px);
     }
 
+    .indicators a:hover {
+        background-color: inherit;
+    }
+
     .indicator {
         width: 30px;
         float: left;
diff --git a/view/frontend/web/js/navigation-slider-widget.js b/view/frontend/web/js/navigation-slider-widget.js
index b5a8449d..451d34cc 100644
--- a/view/frontend/web/js/navigation-slider-widget.js
+++ b/view/frontend/web/js/navigation-slider-widget.js
@@ -24,7 +24,7 @@ define([
             currentMax: 99999999,
             formFilters: false,
             ajaxFilters: false,
-            containsBucket: false,
+            containsBuckets: false,
             containsClickpoints: false
         },
 
@@ -90,7 +90,7 @@ define([
             var sliderContainer = $(this.options.container);
             sliderContainer.on('change', '.slider-min', this._updateSliderUrlInput.bind(this));
             sliderContainer.on('change', '.slider-max', this._updateSliderUrlInput.bind(this));
-            if (this.options.containsBucket) {
+            if (this.options.containsBuckets) {
                 sliderContainer.on('click', '.bucket-link', this._clickBucketSlider.bind(this));
             }
 

From 6ef3b4f81acad3de10a43ef42b11bbd81f44dcb8 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:12:55 +0200
Subject: [PATCH 21/23] Update slider.phtml

---
 view/frontend/templates/product/layered/slider.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/templates/product/layered/slider.phtml b/view/frontend/templates/product/layered/slider.phtml
index 7095c8c7..22db3d72 100644
--- a/view/frontend/templates/product/layered/slider.phtml
+++ b/view/frontend/templates/product/layered/slider.phtml
@@ -60,7 +60,7 @@ $disabledSliderUrlInputValue = sprintf('%s-%s', $minValue, $maxValue);
             >
         </div>
         <div class="slider-max-wrapper">
-            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=__('To')?></label>
+            <label for="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"><?=$escaper->escapeHtml(__('To'))?></label>
             <input type="text"
                    class="slider-max js-skip-submit"
                    id="<?= $escaper->escapeHtmlAttr($urlKey) ?>-max"

From b101cf4ca2450599f4a2f4ab22a9b1fef6b65fde Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:56:27 +0200
Subject: [PATCH 22/23] Fix lint issue

---
 Model/Client.php            |  7 +++++--
 Model/Config.php            | 22 +---------------------
 Model/ModuleInformation.php | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 Model/ModuleInformation.php

diff --git a/Model/Client.php b/Model/Client.php
index 6c3bcedf..18ee7fcf 100644
--- a/Model/Client.php
+++ b/Model/Client.php
@@ -71,13 +71,16 @@ class Client
      * @param Logger $log
      * @param ResponseFactory $responseFactory
      * @param EndpointManager $endpointManager
+     * @param Timer $timer
+     * @param ModuleInformation $moduleInformation
      */
     public function __construct(
         Config $config,
         Logger $log,
         ResponseFactory $responseFactory,
         EndpointManager $endpointManager,
-        Timer $timer
+        Timer $timer,
+        private readonly ModuleInformation $moduleInformation
     ) {
         $this->config = $config;
         $this->log = $log;
@@ -97,7 +100,7 @@ protected function getClient(): HttpClient
                 RequestOptions::HEADERS => [
                     'user-agent' => $this->config->getUserAgentString(),
                     'Accept-Encoding' => 'gzip, deflate',
-                    'TWN-Source' => $this->config->getModuleVersion(),
+                    'TWN-Source' => $this->moduleInformation->getModuleVersion(),
                 ]
             ];
             $this->client = new HttpClient($options);
diff --git a/Model/Config.php b/Model/Config.php
index 6e96aa38..f356aac4 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -21,7 +21,6 @@
 use Magento\Store\Model\Store;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\Config\Storage\WriterInterface;
-use Magento\Framework\Composer\ComposerInformation;
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -121,7 +120,6 @@ class Config
      * @param State $state
      * @param WriterInterface $configWriter
      * @param TypeListInterface $cacheTypeList
-     * @param ComposerInformation $composerInformation
      * @throws LocalizedException
      */
     public function __construct(
@@ -130,8 +128,7 @@ public function __construct(
         RequestInterface $request,
         State $state,
         WriterInterface $configWriter,
-        TypeListInterface $cacheTypeList,
-        private readonly ComposerInformation $composerInformation
+        TypeListInterface $cacheTypeList
     ) {
         $this->config = $config;
         $this->jsonSerializer = $jsonSerializer;
@@ -641,21 +638,4 @@ public function getProductCardLifetime(): int
     {
         return (int) $this->config->getValue(self::PRODUCT_CARD_LIFETIME_XML_PATH, ScopeInterface::SCOPE_STORE);
     }
-
-    /**
-     * @return string
-     */
-    public function getModuleVersion(): string
-    {
-        $installedPackages = $this->composerInformation
-            ->getInstalledMagentoPackages();
-        if (!isset($installedPackages['tweakwise/magento2-tweakwise']['version'])) {
-            // This should never be the case
-            return '';
-        }
-
-        $version = $installedPackages['tweakwise/magento2-tweakwise']['version'];
-
-        return sprintf('Magento2Tweakwise %s', $version);
-    }
 }
diff --git a/Model/ModuleInformation.php b/Model/ModuleInformation.php
new file mode 100644
index 00000000..e49b8b02
--- /dev/null
+++ b/Model/ModuleInformation.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tweakwise\Magento2Tweakwise\Model;
+
+use Magento\Framework\Composer\ComposerInformation;
+
+class ModuleInformation
+{
+    /**
+     * @param ComposerInformation $composerInformation
+     */
+    public function __construct(
+        private readonly ComposerInformation $composerInformation
+    ) {
+    }
+
+    /**
+     * @return string
+     */
+    public function getModuleVersion(): string
+    {
+        $installedPackages = $this->composerInformation
+            ->getInstalledMagentoPackages();
+        if (!isset($installedPackages['tweakwise/magento2-tweakwise']['version'])) {
+            // This should never be the case
+            return '';
+        }
+
+        $version = $installedPackages['tweakwise/magento2-tweakwise']['version'];
+
+        return sprintf('Magento2Tweakwise %s', $version);
+    }
+}

From 092d67361603d92ebbbe9e2c83334468133ed6e9 Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:15:47 +0200
Subject: [PATCH 23/23] Bump version number

---
 etc/adminhtml/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 61284868..0503db62 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -12,7 +12,7 @@
         <section id="tweakwise">
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>General</label>
-                <comment>Tweakwise version v8.1.0</comment>
+                <comment>Tweakwise version v8.2.0</comment>
                 <field id="authentication_key" translate="label,comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Authentication key</label>
                     <comment>Provided by Tweakwise (8 alphanumeric characters)</comment>