Aggressively remove spaces between tags

WyriHaximus · WyriHaximus · commit c30e8aa375a6 · 2020-02-08T23:53:51.000+01:00
Signed-off-by: Cees-Jan Kiewiet &lt;ceesjank@gmail.com&gt;
diff --git a/src/Compressor/HtmlCompressor.php b/src/Compressor/HtmlCompressor.php
@@ -15,6 +15,7 @@ final class HtmlCompressor implements CompressorInterface
     public function __construct(Patterns $patterns)
     {
         $this->htmlMin = new HtmlMin();
+        $this->htmlMin->doRemoveSpacesBetweenTags(true);
         $this->htmlMin->attachObserverToTheDomLoop(new HtmlMinObserver($patterns));
     }
 
diff --git a/tests/Compressor/HtmlCompressorTest.php b/tests/Compressor/HtmlCompressorTest.php
@@ -58,7 +58,7 @@ public function providerMultipleSpaces(): iterable
         ];
         yield [
             "<html>\n    <head>     </head>\n    <body>\n      <p id=\"text\" class=\"foo\">\n        foo\n      </p>  <br />  <ul > <li> <p class=\"foo\">lall</p> </li></ul>\n    </body>\n    </html>",
-            '<html><head> <body><p class=foo id=text> foo </p> <br> <ul><li><p class=foo>lall </ul>',
+            '<html><head><body><p class=foo id=text> foo </p><br><ul><li><p class=foo>lall </ul>',
         ];
     }
 
diff --git a/tests/EdgeCases/WyriHaximus-MinifyHtml-5/out.html b/tests/EdgeCases/WyriHaximus-MinifyHtml-5/out.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><link href=/css/style.css?1453088025 media=all rel=stylesheet> <body><header><nav></nav> </header>
+<!DOCTYPE html><html><head><link href=/css/style.css?1453088025 media=all rel=stylesheet><body><header><nav></nav></header>
diff --git a/tests/EdgeCases/asciinema/out.html b/tests/EdgeCases/asciinema/out.html
@@ -13,4 +13,4 @@
 
     $socket-&gt;listen(1337);
     $loop-&gt;run();
-</code></pre> <script async id=asciicast-18487 src=https://asciinema.org/a/18487.js></script>
+</code></pre><script async id=asciicast-18487 src=https://asciinema.org/a/18487.js></script>
diff --git a/tests/EdgeCases/blog.wyrihaximus.net/out.html b/tests/EdgeCases/blog.wyrihaximus.net/out.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style> <body class=blog><header><nav></nav> </header> <script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><body class=blog><header><nav></nav></header><script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
diff --git a/tests/EdgeCases/ld-json-37/out.html b/tests/EdgeCases/ld-json-37/out.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"https:\/\/schema.org\/","@graph":[{"@context":"https:\/\/schema.org\/","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"item":{"name":"Home","@id":"http:\/\/domain.com"}},{"@type":"ListItem","position":2,"item":{"name":"Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/"}},{"@type":"ListItem","position":3,"item":{"name":"Sub Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/sub-category-name\/"}}]},{"@context":"https:\/\/schema.org\/","@graph":[{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-potiron\/","name":"Mijot\u00e9e de potiron","url":"http:\/\/domain.com\/product\/mijote-de-potiron\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/","name":"Mijot\u00e9e de haricot vert","url":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/","name":"Mijot\u00e9e de carotte","url":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/","name":"Mijot\u00e9e de petit pois","url":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/","name":"Mijot\u00e9e de patate douce","url":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/","name":"Mijot\u00e9e de brocoli","url":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/"}]}]}</script> <body class=blog><header><nav></nav> </header> <script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"https:\/\/schema.org\/","@graph":[{"@context":"https:\/\/schema.org\/","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"item":{"name":"Home","@id":"http:\/\/domain.com"}},{"@type":"ListItem","position":2,"item":{"name":"Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/"}},{"@type":"ListItem","position":3,"item":{"name":"Sub Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/sub-category-name\/"}}]},{"@context":"https:\/\/schema.org\/","@graph":[{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-potiron\/","name":"Mijot\u00e9e de potiron","url":"http:\/\/domain.com\/product\/mijote-de-potiron\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/","name":"Mijot\u00e9e de haricot vert","url":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/","name":"Mijot\u00e9e de carotte","url":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/","name":"Mijot\u00e9e de petit pois","url":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/","name":"Mijot\u00e9e de patate douce","url":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/","name":"Mijot\u00e9e de brocoli","url":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/"}]}]}</script><body class=blog><header><nav></nav></header><script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
diff --git a/tests/EdgeCases/ld-json/out.html b/tests/EdgeCases/ld-json/out.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script> <body class=blog><header><nav></nav> </header> <script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script><body class=blog><header><nav></nav></header><script>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
diff --git a/tests/Factory/fastest/out.html b/tests/Factory/fastest/out.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>/** quick fix because bootstrap <pre> has a background-color. */
-        pre code { background-color: inherit; }</style> <body class=blog><header><nav></nav> </header> <script>window.jQuery || document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>');
+        pre code { background-color: inherit; }</style><body class=blog><header><nav></nav></header><script>window.jQuery || document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>');
     alert('hoi');</script>
diff --git a/tests/Factory/normal/out.html b/tests/Factory/normal/out.html
@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style rng=/dev/null rsync=off>pre code{background-color:inherit}</style> <body class=blog style=background-color:red><header><nav></nav> </header> <script>alert('hoi')</script> <hr> <script rng=/dev/null rsync=off>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script> <hr> <script rng=/dev/null rsync=off type=text/javascript>alert('hoi')</script> <hr> <script rng=/dev/null type=language/dutch>Goede morgen,
+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style rng=/dev/null rsync=off>pre code{background-color:inherit}</style><body class=blog style=background-color:red><header><nav></nav></header><script>alert('hoi')</script><hr><script rng=/dev/null rsync=off>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script><hr><script rng=/dev/null rsync=off type=text/javascript>alert('hoi')</script><hr><script rng=/dev/null type=language/dutch>Goede morgen,
             Goede middag,
-            Goede avond</script> <hr> <script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script>
+            Goede avond</script><hr><script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script>
diff --git a/tests/Factory/smallest/out.html b/tests/Factory/smallest/out.html
@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style rng=/dev/null rsync=off>pre code{background-color:inherit}</style> <body class=blog style=background-color:red><header><nav></nav> </header> <script>alert('hoi')</script> <hr> <script rng=/dev/null rsync=off>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script> <hr> <script rng=/dev/null rsync=off type=text/javascript>alert('hoi')</script> <hr> <script rng=/dev/null type=language/dutch>Goede morgen,
+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style rng=/dev/null rsync=off>pre code{background-color:inherit}</style><body class=blog style=background-color:red><header><nav></nav></header><script>alert('hoi')</script><hr><script rng=/dev/null rsync=off>window.jQuery||document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script><hr><script rng=/dev/null rsync=off type=text/javascript>alert('hoi')</script><hr><script rng=/dev/null type=language/dutch>Goede morgen,
                 Goede middag,
-                Goede avond</script> <hr> <script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script>
+                Goede avond</script><hr><script type=application/ld+json>{"@context":"http://schema.org/","@type":"Product","name":"Yoast SEO for WordPress","image":"https://cdn-images.yoast.com/uploads/2010/10/Yoast_SEO_WP_plugin_FB.png","description":"Yoast SEO is the most complete WordPress SEO plugin. It handles the technical optimization of your site & assists with optimizing your content.","brand":{"@type":"Thing","name":"Yoast"},"offers":{"@type":"Offer","priceCurrency":"USD","price":"69.00"}}</script>

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ final class HtmlCompressor implements CompressorInterface`
`15`	`15`	`public function __construct(Patterns $patterns)`
`16`	`16`	`{`
`17`	`17`	`$this->htmlMin = new HtmlMin();`
	`18`	`+ $this->htmlMin->doRemoveSpacesBetweenTags(true);`
`18`	`19`	`$this->htmlMin->attachObserverToTheDomLoop(new HtmlMinObserver($patterns));`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function providerMultipleSpaces(): iterable`
`58`	`58`	`];`
`59`	`59`	`yield [`
`60`	`60`	`"<html>\n <head> </head>\n <body>\n <p id=\"text\" class=\"foo\">\n foo\n </p> <br /> <ul > <li> <p class=\"foo\">lall</p> </li></ul>\n </body>\n </html>",`
`61`		`- '<html><head> <body><p class=foo id=text> foo </p> <br> <ul><li><p class=foo>lall </ul>',`
	`61`	`+ '<html><head><body><p class=foo id=text> foo </p><br><ul><li><p class=foo>lall </ul>',`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!DOCTYPE html><html><head><link href=/css/style.css?1453088025 media=all rel=stylesheet> <body><header><nav></nav> </header>`
	`1`	`+<!DOCTYPE html><html><head><link href=/css/style.css?1453088025 media=all rel=stylesheet><body><header><nav></nav></header>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style> <body class=blog><header><nav></nav> </header> <script>window.jQuery\|\|document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>`
	`1`	`+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><body class=blog><header><nav></nav></header><script>window.jQuery\|\|document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"https:\/\/schema.org\/","@graph":[{"@context":"https:\/\/schema.org\/","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"item":{"name":"Home","@id":"http:\/\/domain.com"}},{"@type":"ListItem","position":2,"item":{"name":"Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/"}},{"@type":"ListItem","position":3,"item":{"name":"Sub Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/sub-category-name\/"}}]},{"@context":"https:\/\/schema.org\/","@graph":[{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-potiron\/","name":"Mijot\u00e9e de potiron","url":"http:\/\/domain.com\/product\/mijote-de-potiron\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/","name":"Mijot\u00e9e de haricot vert","url":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/","name":"Mijot\u00e9e de carotte","url":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/","name":"Mijot\u00e9e de petit pois","url":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/","name":"Mijot\u00e9e de patate douce","url":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/","name":"Mijot\u00e9e de brocoli","url":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/"}]}]}</script> <body class=blog><header><nav></nav> </header> <script>window.jQuery\|\|document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>
	`1`	+<!DOCTYPE html><html><head><meta content="noindex, follow" name=robots><style>pre code{background-color:inherit}</style><script type=application/ld+json>{"@context":"https:\/\/schema.org\/","@graph":[{"@context":"https:\/\/schema.org\/","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"item":{"name":"Home","@id":"http:\/\/domain.com"}},{"@type":"ListItem","position":2,"item":{"name":"Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/"}},{"@type":"ListItem","position":3,"item":{"name":"Sub Category title","@id":"http:\/\/domain.com\/product-category\/category-name\/sub-category-name\/"}}]},{"@context":"https:\/\/schema.org\/","@graph":[{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-potiron\/","name":"Mijot\u00e9e de potiron","url":"http:\/\/domain.com\/product\/mijote-de-potiron\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/","name":"Mijot\u00e9e de haricot vert","url":"http:\/\/domain.com\/product\/mijote-de-haricot-vert-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/","name":"Mijot\u00e9e de carotte","url":"http:\/\/domain.com\/product\/mijote-de-carotte-2\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/","name":"Mijot\u00e9e de petit pois","url":"http:\/\/domain.com\/product\/mijote-de-petit-pois\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/","name":"Mijot\u00e9e de patate douce","url":"http:\/\/domain.com\/product\/mijote-de-patate-douce\/"},{"@type":"Product","@id":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/","name":"Mijot\u00e9e de brocoli","url":"http:\/\/domain.com\/product\/mijote-de-brocoli-2\/"}]}]}</script><body class=blog><header><nav></nav></header><script>window.jQuery\|\|document.write('<script src="http://blog.wyrihaximus.net/components/jquery/jquery.min.js"><\/script>')</script>