MC-37324: Add fallback to 'patch' command when 'git' command is not available

- Remove formatErrorOutput

Author: bubasuma

src/Command/Process/Action/RevertAction.php

@@ -179,7 +179,7 @@ private function printPatchRevertingFailed(OutputInterface $output, PatchInterfa
             'Reverting patch %s (%s) failed.%s',
             $patch->getId(),
             $patch->getPath(),
-            $this->renderer->formatErrorOutput($errorOutput)
+            PHP_EOL . $errorOutput
         );
 
         $this->logger->error($errorMessage);

src/Command/Process/ApplyLocal.php

@@ -95,7 +95,7 @@ public function run(InputInterface $input, OutputInterface $output)
                 $errorMessage = sprintf(
                     'Applying patch %s failed.%s',
                     $patch->getPath(),
-                    $this->renderer->formatErrorOutput($exception->getMessage())
+                    PHP_EOL . $exception->getMessage()
                 );
 
                 throw new RuntimeException($errorMessage, $exception->getCode());

src/Command/Process/Ece/Revert.php

@@ -121,7 +121,7 @@ function ($patch) {
                 $errorMessage = sprintf(
                     'Reverting patch %s failed.%s',
                     $patch->getPath(),
-                    $this->renderer->formatErrorOutput($exception->getMessage())
+                    PHP_EOL . $exception->getMessage()
                 );
                 $this->printError($output, $errorMessage);
             }

src/Command/Process/Renderer.php

@@ -140,21 +140,6 @@ public function printPatchInfo(
         $output->writeln('');
     }
 
-    /**
-     * Format error output.
-     *
-     * @param string $errorOutput
-     * @return string
-     */
-    public function formatErrorOutput(string $errorOutput): string
-    {
-        if (preg_match('#^.*?Error Output:(?<errors>.*?)$#is', $errorOutput, $matches)) {
-            $errorOutput = PHP_EOL . 'Error Output:' . $matches['errors'];
-        }
-
-        return $errorOutput;
-    }
-
     /**
      * Asks a confirmation question to the user.
      *

src/Patch/Conflict/Processor.php

@@ -84,7 +84,7 @@ public function process(
             'Applying patch %s (%s) failed.%s%s',
             $patch->getId(),
             $patch->getPath(),
-            $this->renderer->formatErrorOutput($exceptionMessage),
+            PHP_EOL. $exceptionMessage,
             $conflictDetails ? PHP_EOL . $conflictDetails : ''
         );
 

src/Shell/Command/DriverException.php

@@ -37,14 +37,14 @@ private function formatMessage(string $message): string
         $errorMsg = null;
         $generalMsg = null;
         if (preg_match('#^.*?Error Output:(?<errors>.*?)$#is', $result, $matches)) {
-            $errorMsg = PHP_EOL .'Error Output:' . $matches['errors'];
+            $errorMsg = 'Error Output:' . $matches['errors'];
             $result = str_replace($errorMsg, '', $result);
             if (!trim(str_replace('=', '', $matches['errors']))) {
                 $errorMsg = null;
             }
         }
         if (empty($errorMsg) && preg_match('#^.*?Output:(?<errors>.*?)$#is', $result, $matches)) {
-            $generalMsg = PHP_EOL .'Output:' . $matches['errors'];
+            $generalMsg = 'Output:' . $matches['errors'];
             if (!trim(str_replace('=', '', $matches['errors']))) {
                 $generalMsg = null;
             }

src/Test/Unit/Command/Process/Action/RevertActionTest.php

@@ -184,9 +184,6 @@ public function testRevertWithException()
         $this->applier->method('revert')
             ->willThrowException(new ApplierException('Error'));
 
-        $this->renderer->expects($this->once())
-            ->method('formatErrorOutput')
-            ->with('Error');
         $outputMock->expects($this->once())
             ->method('writeln')
             ->withConsecutive(

src/Test/Unit/Command/Process/ApplyLocalTest.php

@@ -171,9 +171,6 @@ function ($path, $title) {
             ->method('process')
             ->withConsecutive([[$patch1]])
             ->willReturn($rollbackMessages);
-        $this->renderer->expects($this->once())
-            ->method('formatErrorOutput')
-            ->with('Applier error message');
 
         $this->expectException(RuntimeException::class);
         $this->manager->run($inputMock, $outputMock);

src/Test/Unit/Command/Process/Ece/RevertTest.php

@@ -165,10 +165,6 @@ function ($path, $title) {
                 }
             );
 
-        $this->renderer->expects($this->once())
-            ->method('formatErrorOutput')
-            ->with('Applier error message');
-
         $this->revertAction->expects($this->once())
             ->method('execute')
             ->withConsecutive([$inputMock, $outputMock, []]);

src/Test/Unit/Command/Process/RendererTest.php

@@ -122,53 +122,6 @@ public function printPatchInfoDataProvider(): array
         ];
     }
 
-    /**
-     * Tests error output formatting.
-     *
-     * @param string $errorOutput
-     * @param string $expectedOutput
-     * @dataProvider formatErrorOutputDataProvider
-     */
-    public function testFormatErrorOutput(string $errorOutput, string $expectedOutput)
-    {
-        $this->assertEquals($expectedOutput, $this->renderer->formatErrorOutput($errorOutput));
-    }
-
-    /**
-     * @return array
-     */
-    public function formatErrorOutputDataProvider(): array
-    {
-        return [
-            [
-                'error' => 'The command "\'git\' \'apply\' \'/path/to/patch/MC-1111_test_patch_1.1.1_ce.patch\'" failed.
-
-Exit Code: 1(General error)
-
-Working directory: /path/to/patch
-
-Output:
-================
-
-
-Error Output:
-================
-error: patch failed: vendor/magento/module-admin-analytics/Controller/Adminhtml/Config/DisableAdminUsage.php:23
-error: vendor/magento/module-admin-analytics/Controller/Adminhtml/Config/DisableAdminUsage.php: patch does not apply',
-
-                'expectedOutput' => '
-Error Output:
-================
-error: patch failed: vendor/magento/module-admin-analytics/Controller/Adminhtml/Config/DisableAdminUsage.php:23
-error: vendor/magento/module-admin-analytics/Controller/Adminhtml/Config/DisableAdminUsage.php: patch does not apply'
-            ],
-            [
-                'error' => 'Some other output',
-                'expectedOutput' => 'Some other output'
-            ],
-        ];
-    }
-
     /**
      * Creates patch mock.
      *