MC-36032: ece-patches apply command updates (magento#761)

Author: viktym

src/Patch/Manager.php

@@ -51,28 +51,21 @@ public function __construct(
     /**
      * Applies all needed patches.
      *
-     * @param array $qualityPatches
      * @throws ShellException
      * @throws ConfigException
      */
-    public function apply(array $qualityPatches = []): void
+    public function apply(): void
     {
-        $this->logger->notice('Applying patches');
-
-        $command = 'php ./vendor/bin/ece-patches apply';
-
-        if ($qualityPatches) {
-            $command .= sprintf(" '%s'", implode("' '", $qualityPatches));
-        }
-
         if ($this->globalSection->get(GlobalSection::VAR_DEPLOYED_MAGENTO_VERSION_FROM_GIT)) {
-            $command .= ' --git-installation 1';
+            $this->logger->info('Git-based installation. Skipping patches applying');
+
+            return;
         }
 
-        $command .= ' --no-interaction';
+        $this->logger->notice('Applying patches');
 
         try {
-            $this->shell->execute($command);
+            $this->shell->execute('php ./vendor/bin/ece-patches apply --no-interaction');
         } catch (ShellException $exception) {
             $this->logger->error($exception->getMessage());
             throw $exception;

src/Step/Build/ApplyPatches.php

@@ -9,7 +9,6 @@
 
 use Magento\MagentoCloud\App\Error;
 use Magento\MagentoCloud\Config\ConfigException;
-use Magento\MagentoCloud\Config\Stage\BuildInterface;
 use Magento\MagentoCloud\Patch\Manager;
 use Magento\MagentoCloud\Shell\ShellException;
 use Magento\MagentoCloud\Step\StepException;
@@ -25,21 +24,12 @@ class ApplyPatches implements StepInterface
      */
     private $manager;
 
-    /**
-     * @var BuildInterface
-     */
-    private $stageConfig;
-
     /**
      * @param Manager $manager
-     * @param BuildInterface $stageConfig
      */
-    public function __construct(
-        Manager $manager,
-        BuildInterface $stageConfig
-    ) {
+    public function __construct(Manager $manager)
+    {
         $this->manager = $manager;
-        $this->stageConfig = $stageConfig;
     }
 
     /**
@@ -48,8 +38,7 @@ public function __construct(
     public function execute(): void
     {
         try {
-            $qualityPatches = $this->stageConfig->get(BuildInterface::VAR_QUALITY_PATCHES);
-            $this->manager->apply($qualityPatches);
+            $this->manager->apply();
         } catch (ConfigException $e) {
             throw new StepException($e->getMessage(), $e->getCode(), $e);
         } catch (ShellException $e) {

src/Test/Unit/Patch/ManagerTest.php

@@ -59,34 +59,45 @@ protected function setUp()
 
     /**
      * Tests patch applying.
-     *
-     * @param bool $deploymentFromGit
-     * @param string[] $qualityPatches
-     * @param string $expectedCommand
-     * @dataProvider applyDataProvider
      */
-    public function testApply(
-        bool $deploymentFromGit,
-        array $qualityPatches,
-        string $expectedCommand
-    ): void {
+    public function testApply(): void
+    {
         $this->globalSectionMock->expects($this->once())
             ->method('get')
             ->with(GlobalSection::VAR_DEPLOYED_MAGENTO_VERSION_FROM_GIT)
-            ->willReturn($deploymentFromGit);
+            ->willReturn(false);
 
         $processMock = $this->getMockForAbstractClass(ProcessInterface::class);
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with($expectedCommand)
+            ->with('php ./vendor/bin/ece-patches apply --no-interaction')
             ->willReturn($processMock);
         $this->loggerMock->method('notice')
             ->withConsecutive(
                 ['Applying patches'],
                 ['End of applying patches']
             );
 
-        $this->manager->apply($qualityPatches);
+        $this->manager->apply();
+    }
+
+    /**
+     * Tests with git-based Magento.
+     */
+    public function testApplyGit(): void
+    {
+        $this->globalSectionMock->expects($this->once())
+            ->method('get')
+            ->with(GlobalSection::VAR_DEPLOYED_MAGENTO_VERSION_FROM_GIT)
+            ->willReturn(true);
+
+        $this->shellMock->expects($this->never())
+            ->method('execute');
+        $this->loggerMock->expects($this->once())
+            ->method('info')
+            ->with('Git-based installation. Skipping patches applying');
+
+        $this->manager->apply();
     }
 
     /**
@@ -99,23 +110,7 @@ public function applyDataProvider(): array
                 'deploymentFromGit' => false,
                 'qualityPatches' => [],
                 'expectedCommand' => 'php ./vendor/bin/ece-patches apply --no-interaction'
-            ],
-            [
-                'deploymentFromGit' => true,
-                'qualityPatches' => [],
-                'expectedCommand' => 'php ./vendor/bin/ece-patches apply --git-installation 1 --no-interaction'
-            ],
-            [
-                'deploymentFromGit' => true,
-                'qualityPatches' => ['MC-11111', 'MC-22222'],
-                'expectedCommand' =>
-                    'php ./vendor/bin/ece-patches apply \'MC-11111\' \'MC-22222\' --git-installation 1 --no-interaction'
-            ],
-            [
-                'deploymentFromGit' => false,
-                'qualityPatches' => ['MC-32365'],
-                'expectedCommand' => 'php ./vendor/bin/ece-patches apply \'MC-32365\' --no-interaction'
-            ],
+            ]
         ];
     }
 

src/Test/Unit/Step/Build/ApplyPatchesTest.php

@@ -32,35 +32,23 @@ class ApplyPatchesTest extends TestCase
      */
     private $managerMock;
 
-    /**
-     * @var BuildInterface|MockObject
-     */
-    private $stageConfigMock;
-
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
         $this->managerMock = $this->createMock(Manager::class);
-        $this->stageConfigMock = $this->getMockForAbstractClass(BuildInterface::class);
 
-        $this->step = new ApplyPatches($this->managerMock, $this->stageConfigMock);
+        $this->step = new ApplyPatches($this->managerMock);
     }
 
     /**
      * @throws StepException
      */
     public function testExecute(): void
     {
-        $qualityPatches = ['MC-3456', 'MC-45678'];
-        $this->stageConfigMock->expects($this->once())
-            ->method('get')
-            ->with(BuildInterface::VAR_QUALITY_PATCHES)
-            ->willReturn($qualityPatches);
         $this->managerMock->expects($this->once())
-            ->method('apply')
-            ->with($qualityPatches);
+            ->method('apply');
 
         $this->step->execute();
     }
@@ -70,10 +58,6 @@ public function testExecute(): void
      */
     public function testExecuteWithConfigException(): void
     {
-        $this->stageConfigMock->expects($this->once())
-            ->method('get')
-            ->with(BuildInterface::VAR_QUALITY_PATCHES)
-            ->willReturn([]);
         $this->managerMock->expects($this->once())
             ->method('apply')
             ->willThrowException(new ConfigException('config not found', Error::BUILD_CONFIG_NOT_DEFINED));
@@ -90,10 +74,6 @@ public function testExecuteWithConfigException(): void
      */
     public function testExecuteWithShellException(): void
     {
-        $this->stageConfigMock->expects($this->once())
-            ->method('get')
-            ->with(BuildInterface::VAR_QUALITY_PATCHES)
-            ->willReturn([]);
         $this->managerMock->expects($this->once())
             ->method('apply')
             ->willThrowException(new ShellException('command failed'));