MAGETWO-34293: Html minification works incorrectly in Layered Navigation

Author: AndriyNasinnyk

dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php

@@ -61,7 +61,7 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $url = 'admin/user_role/roleGrid/sort/role_id/dir/desc/';
-        $regExpPattern = '/col\-role_id\W*(\d+)<.td><[^<>]*?>' . $data['rolename'] . '/siu';
+        $regExpPattern = '/col\-role_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['rolename'] . '/siu';
 
         $extractor = new Extractor($url, $regExpPattern);
 

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

@@ -116,7 +116,7 @@ public function minify($file)
             '#(?<!]]>)\s+</#',
             '</',
             preg_replace(
-                '#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+#',
+                '#((?:<\?php\s+(?!echo|if|elseif|else)[^\?]*)\?>)\s+#',
                 '$1',
                 preg_replace(
                     '#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',
@@ -126,7 +126,7 @@ public function minify($file)
                         . '(?:<(?>textarea|pre|script)\b|\z))#',
                         ' ',
                         preg_replace(
-                            '#(?<!:)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
+                            '#(?<!:|\\\\)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
                                 '#(?<!:)//[^\n\r]*(\s\?\>)#',