Merge pull request #66 from hryvinskyi/patch-1

voku · web-flow · commit 444ed31cba3f · 2022-06-09T06:03:16.000+02:00
Overwrite special script tags
diff --git a/src/voku/helper/HtmlMin.php b/src/voku/helper/HtmlMin.php
@@ -327,6 +327,11 @@ class HtmlMin implements HtmlMinInterface
      */
     private $templateLogicSyntaxInSpecialScriptTags;
 
+    /**
+     * @var string[]|null
+     */
+    private $specialScriptTags;
+
     /**
      * HtmlMin constructor.
      */
@@ -1577,6 +1582,10 @@ private function minifyHtmlDom($html, $multiDecodeNewHtmlEntity): string
         if ($this->templateLogicSyntaxInSpecialScriptTags !== null) {
             $dom->overwriteTemplateLogicSyntaxInSpecialScriptTags($this->templateLogicSyntaxInSpecialScriptTags);
         }
+      
+        if ($this->specialScriptTags !== null) {
+            $dom->overwriteSpecialScriptTags($this->specialScriptTags);
+        }
 
         $dom->getDocument()->preserveWhiteSpace = false; // remove redundant white space
         $dom->getDocument()->formatOutput = false; // do not formats output with indentation
@@ -1951,4 +1960,23 @@ public function overwriteTemplateLogicSyntaxInSpecialScriptTags(array $templateL
 
         return $this;
     }
+
+
+    /**
+     * @param string[] $specialScriptTags
+     *
+     * @return HtmlDomParser
+     */
+    public function overwriteSpecialScriptTags(array $specialScriptTags): self
+    {
+        foreach ($specialScriptTags as $tag) {
+            if (!\is_string($tag)) {
+                throw new \InvalidArgumentException('SpecialScriptTags only allows string[]');
+            }
+        }
+
+        $this->specialScriptTags = $specialScriptTags;
+
+        return $this;
+    }
 }
diff --git a/tests/HtmlMinTest.php b/tests/HtmlMinTest.php
@@ -812,6 +812,64 @@ public function testHtmlInsideJavaScriptTemplates()
         static::assertSame($expected, $htmlMin->minify($html));
     }
 
+    public function testOverwriteSpecialScriptTags()
+    {
+        $html = <<<HTML
+<!doctype html>
+    <html lang="nl">
+        <head></head>
+        <body>
+        <script type="text/x-custom">
+        <ul class="prices-tier items">
+          <% _.each(tierPrices, function(item, key) { %>
+          <%  var priceStr = '<span class="price-container price-tier_price">'
+                  + '<span data-price-amount="' + priceUtils.formatPrice(item.price, currencyFormat) + '"'
+                  + ' data-price-type=""' + ' class="price-wrapper ">'
+                  + '<span class="price">' + priceUtils.formatPrice(item.price, currencyFormat) + '</span>'
+                  + '</span>'
+              + '</span>'; %>
+          <li class="item">
+              <%= 'some text %1 %2'.replace('%1', item.qty).replace('%2', priceStr) %>
+              <strong class="benefit">
+                 save <span class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
+              </strong>
+          </li>
+          <% }); %>
+        </ul>
+        </script>
+        <div data-role="tier-price-block">
+            <div> Some Content </div>
+        </div>
+        </body>
+</html>
+HTML;
+        $htmlMin = new voku\helper\HtmlMin();
+        $htmlMin->overwriteSpecialScriptTags(['text/x-custom']);
+        $expected = <<<HTML
+<!DOCTYPE html><html lang=nl><head> <body><script type=text/x-custom>
+        <ul class="prices-tier items">
+          <% _.each(tierPrices, function(item, key) { %>
+          <%  var priceStr = '<span class="price-container price-tier_price">'
+                  + '<span data-price-amount="' + priceUtils.formatPrice(item.price, currencyFormat) + '"'
+                  + ' data-price-type=""' + ' class="price-wrapper ">'
+                  + '<span class="price">' + priceUtils.formatPrice(item.price, currencyFormat) + '</span>'
+                  + '</span>'
+              + '</span>'; %>
+          <li class="item">
+              <%= 'some text %1 %2'.replace('%1', item.qty).replace('%2', priceStr) %>
+              <strong class="benefit">
+                 save <span class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
+              </strong>
+          </li>
+          <% }); %>
+        </ul>
+        </script> <div data-role=tier-price-block><div> Some Content </div> </div>
+HTML;
+
+
+        static::assertSame($expected, $htmlMin->minify($html));
+    }
+
     public function testHtmlClosingTagInSpecialScript()
     {
         $htmlMin = new \voku\helper\HtmlMin();
