Merge pull request #5816 from magento-qwerty/MC-35064

[CIA] [Cloud] Can't deploy 2.4.0-alpha8 on cloud pro instance

Author: dvoskoboinikov

lib/internal/Magento/Framework/View/Template/Html/Minifier.php

@@ -114,6 +114,18 @@ public function minify($file)
     {
         $dir = dirname($file);
         $fileName = basename($file);
+        $content = $this->readFactory->create($dir)->readFile($fileName);
+        //Storing Heredocs
+        $heredocs = [];
+        $content = preg_replace_callback(
+            '/<<<([A-z]+).*?\1;/ims',
+            function ($match) use (&$heredocs) {
+                $heredocs[] = $match[0];
+
+                return '__MINIFIED_HEREDOC__' .(count($heredocs) - 1);
+            },
+            $content
+        );
         $content = preg_replace(
             '#(?<!]]>)\s+</#',
             '</',
@@ -136,7 +148,7 @@ public function minify($file)
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
-                                    $this->readFactory->create($dir)->readFile($fileName)
+                                    $content
                                 )
                             )
                         )
@@ -145,6 +157,15 @@ public function minify($file)
             )
         );
 
+        //Restoring Heredocs
+        $content = preg_replace_callback(
+            '/__MINIFIED_HEREDOC__(\d+)/ims',
+            function ($match) use ($heredocs) {
+                return $heredocs[(int)$match[1]];
+            },
+            $content
+        );
+
         if (!$this->htmlDirectory->isExist()) {
             $this->htmlDirectory->create();
         }

lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php

@@ -113,6 +113,8 @@ public function testGetPathToMinified()
     /**
      * Covered method minify and test regular expressions
      * @test
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testMinify()
     {
@@ -167,6 +169,12 @@ public function testMinify()
             <?php // echo \$block->getChildHtml('anotherChildBlock'); ?>
         <?php // endif; ?>
     </body>
+    <?php
+    \$sometext = <<<SOMETEXT
+    mytext
+    mytextline2
+SOMETEXT;
+    ?>
 </html>
 TEXT;
 
@@ -189,7 +197,10 @@ public function testMinify()
                 }
             });
             //]]>
-</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body></html>
+</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body><?php \$sometext = <<<SOMETEXT
+    mytext
+    mytextline2
+SOMETEXT; ?></html>
 TEXT;
 
         $this->appDirectoryMock->expects($this->once())