MAGETWO-50673: Static asset deployment is crazy slow with multiple locales

 - MAGETWO-54821: Non executing minification and bundling if they are no activated

Author: mslabko

app/code/Magento/Deploy/Model/Deployer.php

@@ -315,7 +315,7 @@ public function deploy(ObjectManagerFactory $omFactory, array $deployableLanguag
                 }
             }
         }
-        if (!$this->getOption(Options::HTML_MINIFY_OPTION) && $this->getAssetConfig()->isMinifyHtml()) {
+        if (!($this->getOption(Options::HTML_MINIFY_OPTION) ?: !$this->getAssetConfig()->isMinifyHtml())) {
             $this->output->writeln('=== Minify templates ===');
             $this->count = 0;
             foreach ($this->filesUtil->getPhtmlFiles(false, false) as $template) {

lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php

@@ -179,7 +179,7 @@ protected function splitPath($path)
      */
     public function addAsset(LocalInterface $asset)
     {
-        if (!$this->assetConfig->isBundlingJsFiles() || !$this->isValidAsset($asset)) {
+        if (!$this->isValidAsset($asset)) {
             return false;
         }
 
@@ -250,8 +250,6 @@ protected function isValidType(LocalInterface $asset)
      */
     public function flush()
     {
-        if ($this->assetConfig->isBundlingJsFiles()) {
-            $this->bundle->flush();
-        }
+        $this->bundle->flush();
     }
 }

lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php

@@ -70,7 +70,6 @@ protected function setUp()
 
     public function testAddAssetWithInvalidType()
     {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(true);
         $this->asset->expects($this->once())
             ->method('getContentType')
             ->willReturn('testType');
@@ -80,7 +79,6 @@ public function testAddAssetWithInvalidType()
 
     public function testAddAssetWithExcludedFile()
     {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(true);
         $dirRead = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -124,7 +122,6 @@ public function testAddAssetWithExcludedFile()
 
     public function testAddAssetWithExcludedDirectory()
     {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(true);
         $dirRead = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -177,7 +174,6 @@ public function testAddAssetWithExcludedDirectory()
 
     public function testAddAsset()
     {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(true);
         $dirRead = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -221,27 +217,10 @@ public function testAddAsset()
         $this->assertTrue($this->manager->addAsset($this->asset));
     }
 
-    public function testDoNotAddAssetIfBundlingDisabled()
-    {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(false);
-        $this->asset->expects(self::never())->method('getContentType');
-
-        $this->manager->addAsset($this->asset);
-    }
-
     public function testFlush()
     {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(true);
         $this->bundle->expects($this->once())
             ->method('flush');
         $this->manager->flush();
     }
-
-    public function testDoNoFlushIfBundlingDisabled()
-    {
-        $this->assetConfig->expects(self::once())->method('isBundlingJsFiles')->willReturn(false);
-        $this->bundle->expects(self::never())->method('flush');
-
-        $this->manager->flush();
-    }
 }