[+]: fixed issue #28

-> via update from "simple_html_dom"
voku · Feb 28, 2019 · 3ea0d35 · 3ea0d35
1 parent 9cd326d
commit 3ea0d35
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
   ],
   "require": {
     "php": ">=7.0.0",
-    "voku/simple_html_dom": "~4.3",
+    "voku/simple_html_dom": "^4.3.1",
     "ext-dom": "*"
   },
   "require-dev": {

diff --git a/src/voku/helper/HtmlMin.php b/src/voku/helper/HtmlMin.php
@@ -677,10 +677,10 @@ private function domNodeAttributesToString(\DOMNode $node): string
 
                 // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#attributes-0
                 $omit_quotes = $this->doRemoveOmittedQuotes
-                              &&
-                              $attribute->value !== ''
-                              &&
-                              \preg_match('/["\'=<>` \t\r\n\f]+/', $attribute->value) === 0;
+                               &&
+                               $attribute->value !== ''
+                               &&
+                               \preg_match('/["\'=<>` \t\r\n\f]+/', $attribute->value) === 0;
 
                 if (
                     $this->doOptimizeAttributes
@@ -1354,6 +1354,7 @@ private function removeWhitespaceAroundTags(SimpleHtmlDom $element)
         if (isset(self::$trimWhitespaceFromTags[$element->tag])) {
             $node = $element->getNode();
 
+            /** @var \DOMNode[] $candidates */
             $candidates = [];
             if ($node->childNodes->length > 0) {
                 $candidates[] = $node->firstChild;
@@ -1367,7 +1368,7 @@ private function removeWhitespaceAroundTags(SimpleHtmlDom $element)
                     continue;
                 }
 
-                if ($candidate->nodeType === 3) {
+                if ($candidate->nodeType === \XML_TEXT_NODE) {
                     $candidate->nodeValue = \preg_replace(self::$regExSpace, ' ', $candidate->nodeValue);
                 }
             }
@@ -1414,11 +1415,11 @@ public function setDomainsToRemoveHttpPrefixFromAttributes($domainsToRemoveHttpP
      */
     private function sumUpWhitespace(HtmlDomParser $dom): HtmlDomParser
     {
-        $textnodes = $dom->find('//text()');
-        foreach ($textnodes as $textnodeWrapper) {
-            /* @var $textnode \DOMNode */
-            $textnode = $textnodeWrapper->getNode();
-            $xp = $textnode->getNodePath();
+        $text_nodes = $dom->find('//text()');
+        foreach ($text_nodes as $text_node_wrapper) {
+            /* @var $text_node \DOMNode */
+            $text_node = $text_node_wrapper->getNode();
+            $xp = $text_node->getNodePath();
 
             $doSkip = false;
             foreach (self::$skipTagsForRemoveWhitespace as $pattern) {
@@ -1432,7 +1433,7 @@ private function sumUpWhitespace(HtmlDomParser $dom): HtmlDomParser
                 continue;
             }
 
-            $textnode->nodeValue = \preg_replace(self::$regExSpace, ' ', $textnode->nodeValue);
+            $text_node->nodeValue = \preg_replace(self::$regExSpace, ' ', $text_node->nodeValue);
         }
 
         $dom->getDocument()->normalizeDocument();

diff --git a/tests/HtmlMinTest.php b/tests/HtmlMinTest.php
@@ -573,6 +573,25 @@ class="img-responsive"
         static::assertSame($expected, $htmlMin->minify($html));
     }
 
+    public function testKeepWhitespaceInPreTags()
+    {
+        $html = '<pre>
+foo
+        bar
+                zoo
+</pre>';
+
+        $expected = '<pre>
+foo
+        bar
+                zoo
+</pre>';
+
+        $htmlMin = new voku\helper\HtmlMin();
+
+        static::assertSame($expected, $htmlMin->minify($html));
+    }
+
     public function testVueJsExample()
     {
         // init