Merge pull request #2225 from magento-thunder/MAGETWO-89229

Fixed issues:
 - MAGETWO-89229: Add ability to force HTML minification in production mode

Author: Yevhen Miroshnychenko

lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php

@@ -44,6 +44,11 @@ class ConfigOptionsListConstants
      */
     const CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION = 'static_content_on_demand_in_production';
 
+    /**
+     * Paramater for forcing HTML minification even if file is already minified.
+     */
+    const CONFIG_PATH_FORCE_HTML_MINIFICATION = 'force_html_minification';
+
     /**#@+
      * Input keys for the options
      */

lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php

@@ -12,7 +12,7 @@
 use Magento\Framework\View\Template\Html\MinifierInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
 
 /**
  * Provider of template view files
@@ -107,11 +107,11 @@ public function getFile($area, ThemeInterface $themeModel, $file, $module = null
      */
     private function getMinifiedTemplateInProduction($template)
     {
-        if ($this->deploymentConfig->getConfigData(
-            ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION
-        )) {
-            return $this->templateMinifier->getMinified($template);
-        }
-        return $this->templateMinifier->getPathToMinified($template);
+        $forceMinification = $this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            || $this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_FORCE_HTML_MINIFICATION);
+
+        return $forceMinification ?
+            $this->templateMinifier->getMinified($template)
+            : $this->templateMinifier->getPathToMinified($template);
     }
 }

lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php

@@ -92,10 +92,11 @@ public function testGetFileWhenStateDeveloper()
      * Cover getFile when mode is default
      * @param string $mode
      * @param integer $onDemandInProduction
+     * @param integer $forceMinification
      * @param string $method
      * @dataProvider getMinifiedDataProvider
      */
-    public function testGetFileWhenModifiedNeeded($mode, $onDemandInProduction, $method)
+    public function testGetFileWhenModifiedNeeded($mode, $onDemandInProduction, $forceMinification, $method)
     {
         $this->assetConfig
             ->expects($this->once())
@@ -108,8 +109,10 @@ public function testGetFileWhenModifiedNeeded($mode, $onDemandInProduction, $met
 
         $this->deploymentConfigMock->expects($this->any())
             ->method('getConfigData')
-            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
-            ->willReturn($onDemandInProduction);
+            ->willReturnMap([
+                [ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION, $onDemandInProduction],
+                [ConfigOptionsListConstants::CONFIG_PATH_FORCE_HTML_MINIFICATION, $forceMinification],
+            ]);
         $this->state->expects($this->once())
             ->method('getMode')
             ->willReturn($mode);
@@ -156,10 +159,11 @@ public function testGetFileIfMinificationIsDisabled()
     public function getMinifiedDataProvider()
     {
         return [
-            'default with on demand' => [State::MODE_DEFAULT, 1, 'getMinified'],
-            'default without on demand' => [State::MODE_DEFAULT, 0, 'getMinified'],
-            'production with on demand' => [State::MODE_PRODUCTION, 1, 'getMinified'],
-            'production without on demand' => [State::MODE_PRODUCTION, 0, 'getPathToMinified'],
+            'default with on demand' => [State::MODE_DEFAULT, 1, 1, 'getMinified'],
+            'default without on demand' => [State::MODE_DEFAULT, 0, 0, 'getMinified'],
+            'production with on demand' => [State::MODE_PRODUCTION, 1, 0, 'getMinified'],
+            'production without on demand' => [State::MODE_PRODUCTION, 0, 0, 'getPathToMinified'],
+            'production without on demand with minified' => [State::MODE_PRODUCTION, 0, 1, 'getMinified'],
         ];
     }
 }