Merge remote-tracking branch 'origin/AC-2058-v1' into Hammer_Community_Backlog_06092022

glo71317 · glo71317 · commit acacfab5fab6 · 2022-09-06T12:39:45.000+05:30
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -148,7 +148,7 @@ function ($match) use (&$heredocs) {
                                 '#(?<!:|\'|")//[^\n\r<]*(\?\>)#',
                                 ' $1',
                                 preg_replace(
-                                    '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
+                                    '#(?<!:)//[^\n\r(\?\>)]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
                                     ($content ?? '')
                                 )
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
@@ -133,6 +133,8 @@ public function testMinify(): void
  */
 ?>
 <?php //one line comment ?>
+<span><?php // foo ?><?php // bar ?></span>
+
 <html>
     <head>
         <title>Test title</title>
@@ -186,7 +188,7 @@ public function testMinify(): void
 TEXT;
 
         $expectedContent = <<<TEXT
-<?php /** * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><link rel="stylesheet" href='https://www.example.com/2' type="text/css" /><link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" /><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <img src="data:image/gif;base64,P///yH5BAEAAAA" data-component="main-image"><?= \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-component="main-image"><script>
+<?php /** * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <span><?php ?><?php ?></span> <html><head><title>Test title</title></head><link rel="stylesheet" href='https://www.example.com/2' type="text/css" /><link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" /><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <img src="data:image/gif;base64,P///yH5BAEAAAA" data-component="main-image"><?= \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-component="main-image"><script>
             var i = 1;
             var j = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ function ($match) use (&$heredocs) {`
`148`	`148`	`'#(?<!:\|\'\|")//[^\n\r<]*(\?\>)#',`
`149`	`149`	`' $1',`
`150`	`150`	`preg_replace(`
`151`		`- '#(?<!:)//[^\n\r](\<\?php)[^\n\r](\s\?\>)[^\n\r]*#',`
	`151`	`+ '#(?<!:)//[^\n\r(\?\>)](\<\?php)[^\n\r](\s\?\>)[^\n\r]*#',`
`152`	`152`	`'',`
`153`	`153`	`($content ?? '')`
`154`	`154`	`)`