MC-36033: Split ece-patches and magento-patches application

- fixes after CR

Author: viktym

config/services.xml

@@ -73,7 +73,7 @@
         <service id="Magento\CloudPatches\Command\Process\ApplyOptional">
             <argument key="$actionPool" type="service" id="ApplyOptionalActionPool"/>
         </service>
-        <service id="Magento\CloudPatches\Command\Process\ApplyOptionalEce">
+        <service id="Magento\CloudPatches\Command\Process\Ece\ApplyOptional">
             <argument key="$actionPool" type="service" id="ApplyOptionalActionPool"/>
         </service>
         <service id="Magento\CloudPatches\Patch\PatchBuilder" shared="false"/>

src/ApplicationEce.php

@@ -40,8 +40,8 @@ public function __construct(ContainerInterface $container)
     protected function getDefaultCommands()
     {
         return array_merge(parent::getDefaultCommands(), [
-            $this->container->get(Command\ApplyEce::class),
-            $this->container->get(Command\RevertEce::class),
+            $this->container->get(Command\Ece\Apply::class),
+            $this->container->get(Command\Ece\Revert::class),
             $this->container->get(Command\Status::class)
         ]);
     }

src/Command/Apply.php

@@ -28,7 +28,7 @@ class Apply extends AbstractCommand
     /**
      * List of patches to apply.
      */
-    const ARG_LIST_OF_PATCHES = 'list_of_patches';
+    const ARG_LIST_OF_PATCHES = 'list-of-patches';
 
     /**
      * @var ApplyOptional

src/Command/ApplyEce.php renamed to src/Command/Ece/Apply.php

@@ -5,11 +5,12 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Command;
+namespace Magento\CloudPatches\Command\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
+use Magento\CloudPatches\Command\AbstractCommand;
 use Magento\CloudPatches\Command\Process\ApplyLocal;
-use Magento\CloudPatches\Command\Process\ApplyOptionalEce;
+use Magento\CloudPatches\Command\Process\Ece\ApplyOptional;
 use Magento\CloudPatches\Command\Process\ApplyRequired;
 use Magento\CloudPatches\Composer\MagentoVersion;
 use Psr\Log\LoggerInterface;
@@ -19,17 +20,17 @@
 /**
  * Patch apply command (Cloud).
  */
-class ApplyEce extends AbstractCommand
+class Apply extends AbstractCommand
 {
     /**
      * Command name.
      */
     const NAME = 'apply';
 
     /**
-     * @var ApplyOptionalEce
+     * @var ApplyOptional
      */
-    private $applyOptionalEce;
+    private $applyOptional;
 
     /**
      * @var ApplyRequired
@@ -53,20 +54,20 @@ class ApplyEce extends AbstractCommand
 
     /**
      * @param ApplyRequired $applyRequired
-     * @param ApplyOptionalEce $applyOptionalEce
+     * @param ApplyOptional $applyOptional
      * @param ApplyLocal $applyLocal
      * @param LoggerInterface $logger
      * @param MagentoVersion $magentoVersion
      */
     public function __construct(
         ApplyRequired $applyRequired,
-        ApplyOptionalEce $applyOptionalEce,
+        ApplyOptional $applyOptional,
         ApplyLocal $applyLocal,
         LoggerInterface $logger,
         MagentoVersion $magentoVersion
     ) {
         $this->applyRequired = $applyRequired;
-        $this->applyOptionalEce = $applyOptionalEce;
+        $this->applyOptional = $applyOptional;
         $this->applyLocal = $applyLocal;
         $this->logger = $logger;
         $this->magentoVersion = $magentoVersion;
@@ -94,7 +95,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $this->applyRequired->run($input, $output);
-            $this->applyOptionalEce->run($input, $output);
+            $this->applyOptional->run($input, $output);
             $this->applyLocal->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');

src/Command/RevertEce.php renamed to src/Command/Ece/Revert.php

@@ -5,10 +5,11 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Command;
+namespace Magento\CloudPatches\Command\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
-use Magento\CloudPatches\Command\Process\RevertEce as RevertEceProcess;
+use Magento\CloudPatches\Command\AbstractCommand;
+use Magento\CloudPatches\Command\Process\Ece\Revert as RevertProcess;
 use Magento\CloudPatches\Composer\MagentoVersion;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Input\InputInterface;
@@ -17,17 +18,17 @@
 /**
  * Patch revert command (Cloud).
  */
-class RevertEce extends AbstractCommand
+class Revert extends AbstractCommand
 {
     /**
      * Command name.
      */
     const NAME = 'revert';
 
     /**
-     * @var RevertEceProcess
+     * @var RevertProcess
      */
-    private $revertEce;
+    private $revert;
 
     /**
      * @var LoggerInterface
@@ -40,16 +41,16 @@ class RevertEce extends AbstractCommand
     private $magentoVersion;
 
     /**
-     * @param RevertEceProcess $revertEce
+     * @param RevertProcess $revert
      * @param LoggerInterface $logger
      * @param MagentoVersion $magentoVersion
      */
     public function __construct(
-        RevertEceProcess $revertEce,
+        RevertProcess $revert,
         LoggerInterface $logger,
         MagentoVersion $magentoVersion
     ) {
-        $this->revertEce = $revertEce;
+        $this->revert = $revert;
         $this->logger = $logger;
         $this->magentoVersion = $magentoVersion;
 
@@ -75,7 +76,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $this->logger->notice($this->magentoVersion->get());
 
         try {
-            $this->revertEce->run($input, $output);
+            $this->revert->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             $this->logger->error($e->getMessage());

src/Command/Process/ApplyLocal.php

@@ -89,7 +89,7 @@ public function run(InputInterface $input, OutputInterface $output)
                 $this->printInfo($output, $message);
                 array_push($appliedPatches, $patch);
             } catch (ApplierException $exception) {
-                $this->printInfo($output, 'Error: patch conflict happened');
+                $this->printError($output, 'Error: patch conflict happened');
                 $messages = $this->rollbackProcessor->process($appliedPatches);
                 $output->writeln($messages);
                 $errorMessage = sprintf(
@@ -116,4 +116,16 @@ private function printInfo(OutputInterface $output, string $message)
         $output->writeln('<info>' . $message . '</info>');
         $this->logger->info($message);
     }
+
+    /**
+     * Prints and logs error message.
+     *
+     * @param OutputInterface $output
+     * @param string $message
+     */
+    private function printError(OutputInterface $output, string $message)
+    {
+        $output->writeln('<error>' . $message . '</error>');
+        $this->logger->error($message);
+    }
 }

src/Command/Process/ApplyOptionalEce.php renamed to src/Command/Process/Ece/ApplyOptional.php

@@ -5,9 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Command\Process;
+namespace Magento\CloudPatches\Command\Process\Ece;
 
 use Magento\CloudPatches\Command\Process\Action\ActionPool;
+use Magento\CloudPatches\Command\Process\ProcessInterface;
 use Magento\CloudPatches\Environment\Config;
 use Magento\CloudPatches\Patch\FilterFactory;
 use Psr\Log\LoggerInterface;
@@ -17,7 +18,7 @@
 /**
  * Applies optional patches (Cloud).
  */
-class ApplyOptionalEce implements ProcessInterface
+class ApplyOptional implements ProcessInterface
 {
     /**
      * @var FilterFactory

src/Command/Process/RevertEce.php renamed to src/Command/Process/Ece/Revert.php

@@ -5,10 +5,12 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Command\Process;
+namespace Magento\CloudPatches\Command\Process\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
 use Magento\CloudPatches\Command\Process\Action\RevertAction;
+use Magento\CloudPatches\Command\Process\ProcessInterface;
+use Magento\CloudPatches\Command\Process\Renderer;
 use Magento\CloudPatches\Patch\Applier;
 use Magento\CloudPatches\Patch\ApplierException;
 use Magento\CloudPatches\Patch\Pool\LocalPool;
@@ -20,7 +22,7 @@
 /**
  * Reverts all patches (Cloud).
  */
-class RevertEce implements ProcessInterface
+class Revert implements ProcessInterface
 {
     /**
      * @var RevertAction
@@ -53,7 +55,7 @@ class RevertEce implements ProcessInterface
     private $statusPool;
 
     /**
-     * @param Action\RevertAction $revertAction
+     * @param RevertAction $revertAction
      * @param LoggerInterface $logger
      * @param Applier $applier
      * @param LocalPool $localPool

src/Command/Revert.php

@@ -29,7 +29,7 @@ class Revert extends AbstractCommand
     /**
      * List of patches to revert.
      */
-    const ARG_LIST_OF_PATCHES = 'list_of_patches';
+    const ARG_LIST_OF_PATCHES = 'list-of-patches';
 
     /**
      * Revert all patches.

src/Test/Unit/Command/ApplyEceTest.php renamed to src/Test/Unit/Command/Ece/ApplyTest.php

@@ -5,13 +5,13 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Test\Unit\Command;
+namespace Magento\CloudPatches\Test\Unit\Command\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
 use Magento\CloudPatches\Command\AbstractCommand;
-use Magento\CloudPatches\Command\ApplyEce;
+use Magento\CloudPatches\Command\Ece\Apply;
 use Magento\CloudPatches\Command\Process\ApplyLocal;
-use Magento\CloudPatches\Command\Process\ApplyOptionalEce;
+use Magento\CloudPatches\Command\Process\Ece\ApplyOptional;
 use Magento\CloudPatches\Command\Process\ApplyRequired;
 use Magento\CloudPatches\Composer\MagentoVersion;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -23,10 +23,10 @@
 /**
  * @inheritDoc
  */
-class ApplyEceTest extends TestCase
+class ApplyTest extends TestCase
 {
     /**
-     * @var ApplyEce
+     * @var Apply
      */
     private $command;
 
@@ -36,7 +36,7 @@ class ApplyEceTest extends TestCase
     private $applyLocal;
 
     /**
-     * @var ApplyOptionalEce|MockObject
+     * @var ApplyOptional|MockObject
      */
     private $applyOptionalEce;
 
@@ -61,12 +61,12 @@ class ApplyEceTest extends TestCase
     protected function setUp()
     {
         $this->applyLocal = $this->createMock(ApplyLocal::class);
-        $this->applyOptionalEce = $this->createMock(ApplyOptionalEce::class);
+        $this->applyOptionalEce = $this->createMock(ApplyOptional::class);
         $this->applyRequired = $this->createMock(ApplyRequired::class);
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->magentoVersion = $this->createMock(MagentoVersion::class);
 
-        $this->command = new ApplyEce(
+        $this->command = new Apply(
             $this->applyRequired,
             $this->applyOptionalEce,
             $this->applyLocal,

src/Test/Unit/Command/RevertEceTest.php renamed to src/Test/Unit/Command/Ece/RevertTest.php

@@ -5,12 +5,12 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Test\Unit\Command;
+namespace Magento\CloudPatches\Test\Unit\Command\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
 use Magento\CloudPatches\Command\AbstractCommand;
-use Magento\CloudPatches\Command\Process\RevertEce as RevertEceProcess;
-use Magento\CloudPatches\Command\RevertEce;
+use Magento\CloudPatches\Command\Process\Ece\Revert as RevertProcess;
+use Magento\CloudPatches\Command\Ece\Revert;
 use Magento\CloudPatches\Composer\MagentoVersion;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -21,15 +21,15 @@
 /**
  * @inheritDoc
  */
-class RevertEceTest extends TestCase
+class RevertTest extends TestCase
 {
     /**
-     * @var RevertEce
+     * @var Revert
      */
     private $command;
 
     /**
-     * @var RevertEceProcess|MockObject
+     * @var RevertProcess|MockObject
      */
     private $revertEce;
 
@@ -43,13 +43,13 @@ class RevertEceTest extends TestCase
      */
     protected function setUp()
     {
-        $this->revertEce = $this->createMock(RevertEceProcess::class);
+        $this->revertEce = $this->createMock(RevertProcess::class);
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
 
         /** @var MagentoVersion|MockObject $magentoVersion */
         $magentoVersion = $this->createMock(MagentoVersion::class);
 
-        $this->command = new RevertEce(
+        $this->command = new Revert(
             $this->revertEce,
             $this->logger,
             $magentoVersion

src/Test/Unit/Command/Process/ApplyOptionalEceTest.php renamed to src/Test/Unit/Command/Process/Ece/ApplyOptionalTest.php

@@ -5,11 +5,11 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CloudPatches\Test\Unit\Command\Process;
+namespace Magento\CloudPatches\Test\Unit\Command\Process\Ece;
 
 use Magento\CloudPatches\App\RuntimeException;
 use Magento\CloudPatches\Command\Process\Action\ActionPool;
-use Magento\CloudPatches\Command\Process\ApplyOptionalEce;
+use Magento\CloudPatches\Command\Process\Ece\ApplyOptional;
 use Magento\CloudPatches\Environment\Config;
 use Magento\CloudPatches\Patch\FilterFactory;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -21,10 +21,10 @@
 /**
  * @inheritdoc
  */
-class ApplyOptionalEceTest extends TestCase
+class ApplyOptionalTest extends TestCase
 {
     /**
-     * @var ApplyOptionalEce
+     * @var ApplyOptional
      */
     private $applyOptionalEce;
 
@@ -58,7 +58,7 @@ protected function setUp()
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->config = $this->createMock(Config::class);
 
-        $this->applyOptionalEce = new ApplyOptionalEce(
+        $this->applyOptionalEce = new ApplyOptional(
             $this->filterFactory,
             $this->actionPool,
             $this->logger,