Merge pull request #37 from magento-thunder/MAGECLOUD-1049

MAGECLOUD-1049: [develop] Exception during deploy with skipped di compilation

Author: oshmyheliuk

src/Magento/MagentoCloud/Config/Build.php

@@ -12,8 +12,6 @@
  */
 class Build
 {
-    const BUILD_OPT_SKIP_DI_COMPILATION = 'skip_di_compilation';
-    const BUILD_OPT_SKIP_DI_CLEARING = 'skip_di_clearing';
     const BUILD_OPT_SCD_EXCLUDE_THEMES = 'exclude_themes';
     const BUILD_OPT_SCD_THREADS = 'scd_threads';
     const BUILD_OPT_SKIP_SCD = 'skip_scd';

src/Magento/MagentoCloud/Process/Build/CompileDi.php

@@ -73,12 +73,8 @@ public function execute()
         $verbosityLevel = $this->buildConfig->getVerbosityLevel();
 
         if ($this->file->isExists($configFile)) {
-            if (!$this->buildConfig->get(BuildConfig::BUILD_OPT_SKIP_DI_COMPILATION)) {
-                $this->logger->info('Running DI compilation');
-                $this->shell->execute("php ./bin/magento setup:di:compile {$verbosityLevel}");
-            } else {
-                $this->logger->info('Skip running DI compilation');
-            }
+            $this->logger->info('Running DI compilation');
+            $this->shell->execute("php ./bin/magento setup:di:compile {$verbosityLevel}");
         } else {
             $this->logger->info(
                 "Missing config.php, please run the following commands "

src/Magento/MagentoCloud/Test/Unit/Process/Build/CompileDiTest.php

@@ -89,10 +89,6 @@ public function testExecute()
             ->method('isExists')
             ->with('magento_root/app/etc/config.php')
             ->willReturn(true);
-        $this->buildConfigMock->expects($this->once())
-            ->method('get')
-            ->with(Build::BUILD_OPT_SKIP_DI_COMPILATION)
-            ->willReturn(false);
         $this->loggerMock->expects($this->once())
             ->method('info')
             ->with('Running DI compilation');
@@ -103,28 +99,6 @@ public function testExecute()
         $this->process->execute();
     }
 
-    public function testExecuteSkipCompilation()
-    {
-        $this->buildConfigMock->expects($this->once())
-            ->method('getVerbosityLevel')
-            ->willReturn('-vvv');
-        $this->fileMock->expects($this->once())
-            ->method('isExists')
-            ->with('magento_root/app/etc/config.php')
-            ->willReturn(true);
-        $this->buildConfigMock->expects($this->once())
-            ->method('get')
-            ->with(Build::BUILD_OPT_SKIP_DI_COMPILATION)
-            ->willReturn(true);
-        $this->loggerMock->expects($this->once())
-            ->method('info')
-            ->with('Skip running DI compilation');
-        $this->shellMock->expects($this->never())
-            ->method('execute');
-
-        $this->process->execute();
-    }
-
     /**
      * @expectedException \RuntimeException
      * @expectedExceptionMessage Missing config.php file