MAGECLOUD-1057: Add possibility to change SCD strategy

Author: oshmyheliuk

src/Magento/MagentoCloud/Process/Build/DeployStaticContent/Generate.php

@@ -9,7 +9,7 @@
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Magento\MagentoCloud\StaticContent\Build\Option;
-use Magento\MagentoCloud\StaticContent\Command;
+use Magento\MagentoCloud\StaticContent\CommandFactory;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -32,9 +32,9 @@ class Generate implements ProcessInterface
     private $environment;
 
     /**
-     * @var Command
+     * @var CommandFactory
      */
-    private $scdCommand;
+    private $commandFactory;
 
     /**
      * @var Option
@@ -45,20 +45,20 @@ class Generate implements ProcessInterface
      * @param ShellInterface $shell
      * @param LoggerInterface $logger
      * @param Environment $environment
-     * @param Command $scdCommand
+     * @param CommandFactory $commandFactory
      * @param Option $buildOption
      */
     public function __construct(
         ShellInterface $shell,
         LoggerInterface $logger,
         Environment $environment,
-        Command $scdCommand,
+        CommandFactory $commandFactory,
         Option $buildOption
     ) {
         $this->shell = $shell;
         $this->logger = $logger;
         $this->environment = $environment;
-        $this->scdCommand = $scdCommand;
+        $this->commandFactory = $commandFactory;
         $this->buildOption = $buildOption;
     }
 
@@ -84,7 +84,7 @@ public function execute()
 
             $this->logger->info($logMessage);
 
-            $parallelCommands = $this->scdCommand->createParallel($this->buildOption);
+            $parallelCommands = $this->commandFactory->createParallel($this->buildOption);
 
             $this->shell->execute(sprintf(
                 "printf '%s' | xargs -I CMD -P %d bash -c CMD",

src/Magento/MagentoCloud/Process/Deploy/DeployStaticContent/Generate.php

@@ -10,7 +10,7 @@
 use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
-use Magento\MagentoCloud\StaticContent\Command;
+use Magento\MagentoCloud\StaticContent\CommandFactory;
 use Magento\MagentoCloud\StaticContent\Deploy\Option;
 use Psr\Log\LoggerInterface;
 
@@ -45,9 +45,10 @@ class Generate implements ProcessInterface
     private $directoryList;
 
     /**
-     * @var Command
+     * @var CommandFactory
      */
-    private $scdCommand;
+    private $commandFactory;
+
     /**
      * @var Option
      */
@@ -59,7 +60,7 @@ class Generate implements ProcessInterface
      * @param Environment $environment
      * @param File $file
      * @param DirectoryList $directoryList
-     * @param Command $scdCommand
+     * @param CommandFactory $commandFactory
      * @param Option $deployOption
      */
     public function __construct(
@@ -68,15 +69,15 @@ public function __construct(
         Environment $environment,
         File $file,
         DirectoryList $directoryList,
-        Command $scdCommand,
+        CommandFactory $commandFactory,
         Option $deployOption
     ) {
         $this->shell = $shell;
         $this->logger = $logger;
         $this->environment = $environment;
         $this->file = $file;
         $this->directoryList = $directoryList;
-        $this->scdCommand = $scdCommand;
+        $this->commandFactory = $commandFactory;
         $this->deployOption = $deployOption;
     }
 
@@ -96,7 +97,7 @@ public function execute()
 
         $this->logger->info($logMessage);
 
-        $command = $this->scdCommand->create($this->deployOption);
+        $command = $this->commandFactory->create($this->deployOption);
 
         $this->shell->execute($command);
 

src/Magento/MagentoCloud/StaticContent/Command.php renamed to src/Magento/MagentoCloud/StaticContent/CommandFactory.php

@@ -8,7 +8,7 @@
 /**
  * Creates static deploy command
  */
-class Command
+class CommandFactory
 {
     /**
      * Creates static deploy command based on given options
@@ -34,11 +34,11 @@ public function create(OptionInterface $option): string
     }
 
     /**
-     * This method should be removed after replacing xargs with --jobs parameter in build phase
+     * Creates static deploy command for running in parallel for xargs command
      *
      * @param OptionInterface $option
      * @return string
-     * @deprecated
+     * @deprecated This method should be removed after replacing xargs with --jobs parameter in build phase
      */
     public function createParallel(OptionInterface $option): string
     {

src/Magento/MagentoCloud/Test/Unit/Process/Build/DeployStaticContent/GenerateTest.php

@@ -9,7 +9,7 @@
 use Magento\MagentoCloud\Process\Build\DeployStaticContent\Generate;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Magento\MagentoCloud\StaticContent\Build\Option;
-use Magento\MagentoCloud\StaticContent\Command;
+use Magento\MagentoCloud\StaticContent\CommandFactory;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 use Psr\Log\LoggerInterface;
@@ -40,9 +40,9 @@ class GenerateTest extends TestCase
     private $environmentMock;
 
     /**
-     * @var Command|Mock
+     * @var CommandFactory|Mock
      */
-    private $commandMock;
+    private $commandFactoryMock;
 
     /**
      * @var Option|Mock
@@ -57,14 +57,14 @@ protected function setUp()
         $this->shellMock = $this->getMockForAbstractClass(ShellInterface::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->environmentMock = $this->createMock(Environment::class);
-        $this->commandMock = $this->createMock(Command::class);
+        $this->commandFactoryMock = $this->createMock(CommandFactory::class);
         $this->optionMock = $this->createMock(Option::class);
 
         $this->process = new Generate(
             $this->shellMock,
             $this->loggerMock,
             $this->environmentMock,
-            $this->commandMock,
+            $this->commandFactoryMock,
             $this->optionMock
         );
     }
@@ -81,7 +81,7 @@ public function testExecute()
             ->withConsecutive(
                 ["Generating static content for locales: ua_UA fr_FR es_ES en_US\nUsing 3 Threads"]
             );
-        $this->commandMock->expects($this->once())
+        $this->commandFactoryMock->expects($this->once())
             ->method('createParallel')
             ->with($this->optionMock)
             ->willReturn('some parallel command');

src/Magento/MagentoCloud/Test/Unit/Process/Deploy/DeployStaticContent/GenerateTest.php

@@ -11,7 +11,7 @@
 use Magento\MagentoCloud\Process\Deploy\DeployStaticContent\Generate;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Magento\MagentoCloud\StaticContent\Deploy\Option;
-use Magento\MagentoCloud\StaticContent\Command;
+use Magento\MagentoCloud\StaticContent\CommandFactory;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 use Psr\Log\LoggerInterface;
@@ -52,9 +52,9 @@ class GenerateTest extends TestCase
     private $directoryListMock;
 
     /**
-     * @var Command|Mock
+     * @var CommandFactory|Mock
      */
-    private $commandMock;
+    private $commandFactoryMock;
 
     /**
      * @var Option|Mock
@@ -73,7 +73,7 @@ protected function setUp()
         $this->fileMock = $this->createMock(File::class);
         $this->directoryListMock = $this->createMock(DirectoryList::class);
         $this->environmentMock = $this->createMock(Environment::class);
-        $this->commandMock = $this->createMock(Command::class);
+        $this->commandFactoryMock = $this->createMock(CommandFactory::class);
         $this->deployOption = $this->createMock(Option::class);
 
         $this->process = new Generate(
@@ -82,7 +82,7 @@ protected function setUp()
             $this->environmentMock,
             $this->fileMock,
             $this->directoryListMock,
-            $this->commandMock,
+            $this->commandFactoryMock,
             $this->deployOption
         );
     }
@@ -101,7 +101,7 @@ public function testExecute()
                 ['Generating static content for locales: en_GB fr_FR'],
                 ['Maintenance mode is disabled.']
             );
-        $this->commandMock->expects($this->once())
+        $this->commandFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn('php ./bin/magento static:content:deploy:command');
         $this->shellMock->expects($this->exactly(3))

src/Magento/MagentoCloud/Test/Unit/StaticContent/CommandTest.php

@@ -5,21 +5,21 @@
  */
 namespace Magento\MagentoCloud\Test\Unit\StaticContent;
 
-use Magento\MagentoCloud\StaticContent\Command;
+use Magento\MagentoCloud\StaticContent\CommandFactory;
 use Magento\MagentoCloud\StaticContent\OptionInterface;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 class CommandTest extends TestCase
 {
     /**
-     * @var Command
+     * @var CommandFactory
      */
-    private $command;
+    private $commandFactory;
 
     public function setUp()
     {
-        $this->command = new Command();
+        $this->commandFactory = new CommandFactory();
     }
 
     /**
@@ -31,7 +31,7 @@ public function testCreate(array $optionConfig, $expected)
     {
         $this->assertEquals(
             $expected,
-            $this->command->create($this->createOption($optionConfig))
+            $this->commandFactory->create($this->createOption($optionConfig))
         );
     }
 
@@ -44,7 +44,7 @@ public function testCreateParallel(array $optionConfig, $expected)
     {
         $this->assertEquals(
             $expected,
-            $this->command->createParallel($this->createOption($optionConfig))
+            $this->commandFactory->createParallel($this->createOption($optionConfig))
         );
     }