Issue with LIBXML_HTML_NOIMPLIED and templates with multiple roots …

…Yireo_Webp2#175
yireo · Feb 19, 2025 · 9ec75ee · 9ec75ee
1 parent 92d895e
commit 9ec75ee
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.12] - 19 February 2025
+### Fixed
+- Issue with `LIBXML_HTML_NOIMPLIED` and templates with multiple roots Yireo_Webp2#175
+
 ## [0.5.11] - 11 February 2025
 ### Fixed
 - Fix possible warning with DOM loading

diff --git a/Test/Unit/Util/HtmlReplacerTest.php b/Test/Unit/Util/HtmlReplacerTest.php
@@ -78,6 +78,14 @@ public function testReplaceWithTestImage(string $originalHtml, string $expectedH
     public function getTestReplaceWithTestImageArguments(): array
     {
         return [
+            [
+                'foobar',
+                'foobar',
+            ],
+            [
+                '<p>foobar</p><p>foobar</p>',
+                '<p>foobar</p><p>foobar</p>',
+            ],
             [
                 '<div><img src="/img/test.png"/></div>',
                 '<div><img src="/img/test.png"/></div>'

diff --git a/Util/HtmlReplacer.php b/Util/HtmlReplacer.php
@@ -88,6 +88,12 @@ public function replace(string $html): string
      */
     private function replaceImageTags(string $html): string
     {
+        if (empty($html)) {
+            return $html;
+        }
+
+        $html = '<yireo_nextgenimages>'.$html.'</yireo_nextgenimages>';
+
         $document = $this->domUtils->htmlToDOMDocument($html);
         $images = $document->getElementsByTagName('img');
         foreach ($images as $image) {
@@ -98,6 +104,9 @@ private function replaceImageTags(string $html): string
             }
         }
 
+        $html = str_replace('<yireo_nextgenimages>', '', $html);
+        $html = str_replace('</yireo_nextgenimages>', '', $html);
+
         return $html;
     }
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "yireo/magento2-next-gen-images",
     "license": "OSL-3.0",
-    "version": "0.5.11",
+    "version": "0.5.12",
     "type": "magento2-module",
     "homepage": "https://www.yireo.com/software/magento-extensions/next-gen-images",
     "description": "Magento 2 module to add NextGen images support to the Magento frontend",