MDVA-210: HTML template minification does not properly handle commented code

Yaroslav Voronoy · Yaroslav Voronoy · commit 0b3788be5028 · 2016-03-31T23:21:47.000+03:00
Conflicts:
	lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -131,7 +131,11 @@ public function minify($file)
                             preg_replace(
                                 '#(?<!:)//[^\n\r]*(\s\?\>)#',
                                 '$1',
-                                $this->rootDirectory->readFile($file)
+                                preg_replace(
+                                    '#//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
+                                    '',
+                                    $this->rootDirectory->readFile($file)
+                                )
                             )
                         )
                     )
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -98,6 +98,10 @@ public function testMinify()
         <?php echo \$block->someMethod(); ?>
         <div style="width: 800px" class="<?php echo \$block->getClass() ?>" />
         <script>
+            var i = 1;// comment
+            var j = 1;// <?php echo 'hi' ?>
+//<?php ?> ')){
+// if (<?php echo __('hi')) { ?>
             //<![CDATA[
             var someVar = 123;
             testFunctionCall(function () {
@@ -118,6 +122,10 @@ public function testMinify()
 
         $expectedContent = <<<TEXT
 <?php /** * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><script>
+            var i = 1;
+            var j = 1;
+
+
             //<![CDATA[
             var someVar = 123;
             testFunctionCall(function () {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,11 @@ public function minify($file)`
`131`	`131`	`preg_replace(`
`132`	`132`	`'#(?<!:)//[^\n\r]*(\s\?\>)#',`
`133`	`133`	`'$1',`
`134`		`- $this->rootDirectory->readFile($file)`
	`134`	`+ preg_replace(`
	`135`	`+ '#//[^\n\r](\<\?php)[^\n\r](\s\?\>)[^\n\r]*#',`
	`136`	`+ '',`
	`137`	`+ $this->rootDirectory->readFile($file)`
	`138`	`+ )`
`135`	`139`	`)`
`136`	`140`	`)`
`137`	`141`	`)`