Merge pull request #100 from frugan-dev/master

fix!: fix SimpleHtmlDom::__construct(): Argument #1 ($node) must be of type DOMNode, null given
voku · May 25, 2024 · 89715ab · 89715ab
2 parents c04332c + 0d5c9c7
commit 89715ab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/voku/helper/HtmlMin.php b/src/voku/helper/HtmlMin.php
@@ -1713,9 +1713,9 @@ private function protectTagHelper(HtmlDomParser $dom, string $selector): HtmlDom
                 continue;
             }
 
-            $this->protectedChildNodes[$this->protected_tags_counter] = $element->parentNode()->innerHtml();
-            $parentNode = $element->getNode()->parentNode;
-            if ($parentNode !== null) {
+            $parentNode = $element->parentNode();
+            if ($parentNode->nodeValue !== null) {
+                $this->protectedChildNodes[$this->protected_tags_counter] = $parentNode->innerHtml();
                 $parentNode->nodeValue = '<' . $this->protectedChildNodesHelper . ' data-' . $this->protectedChildNodesHelper . '="' . $this->protected_tags_counter . '"></' . $this->protectedChildNodesHelper . '>';
             }
 

diff --git a/tests/HtmlMinTest.php b/tests/HtmlMinTest.php
@@ -1668,4 +1668,23 @@ public function testdoKeepHttpAndHttpsPrefixOnExternalAttributes()
         $htmlMin->doKeepHttpAndHttpsPrefixOnExternalAttributes(false);
         static::assertSame($expected, $htmlMin->minify($html));
     }
+
+    public function testNullParentNode()
+    {
+        $html = " <nocompress>foo</nocompress> ";
+        $expected = "<nocompress>foo</nocompress>";
+
+        $htmlMin = new HtmlMin();
+        $htmlMin->doOptimizeViaHtmlDomParser(true);
+        static::assertSame($expected, $htmlMin->minify($html));
+
+        // --
+
+        $html = "<><code>foo</code><>";
+        $expected = "<code>foo</code>";
+
+        $htmlMin = new HtmlMin();
+        $htmlMin->doOptimizeViaHtmlDomParser(true);
+        static::assertSame($expected, $htmlMin->minify($html));
+    }
 }