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

- Remove redundant exceptions

Author: bubasuma

config/services.xml

@@ -30,8 +30,6 @@
         <service id="Magento\CloudPatches\Patch\PatchCommandNotFound" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\PatchCommandException" autowire="false"/>
         <service id="Magento\CloudPatches\Shell\Command\DriverException" autowire="false"/>
-        <service id="Magento\CloudPatches\Shell\Command\GitDriverException" autowire="false"/>
-        <service id="Magento\CloudPatches\Shell\Command\PatchDriverException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\PatchCommand" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\PatchCommandInterface" alias="Magento\CloudPatches\Patch\PatchCommand"/>
         <service id="statusPool" class="Magento\CloudPatches\Patch\Status\StatusPool" lazy="true">

src/Shell/Command/DriverException.php

@@ -8,10 +8,23 @@
 namespace Magento\CloudPatches\Shell\Command;
 
 use Magento\CloudPatches\Patch\PatchCommandException;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Throwable;
 
 /**
  * Patch command driver exception
  */
 class DriverException extends PatchCommandException
 {
+    /**
+     * @param Throwable $previous
+     */
+    public function __construct(Throwable $previous)
+    {
+        $message = $previous->getMessage();
+        if ($previous instanceof ProcessFailedException) {
+            $message = $previous->getProcess()->getErrorOutput() ?: ($previous->getProcess()->getOutput() ?: $message);
+        }
+        parent::__construct($message, $previous->getCode(), $previous);
+    }
 }

src/Shell/Command/GitDriver.php

@@ -38,7 +38,7 @@ public function apply(string $patch)
             $this->processFactory->create(['git', 'apply'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new GitDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -51,7 +51,7 @@ public function revert(string $patch)
             $this->processFactory->create(['git', 'apply', '--reverse'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new GitDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -64,7 +64,7 @@ public function applyCheck(string $patch)
             $this->processFactory->create(['git', 'apply', '--check'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new GitDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -77,7 +77,7 @@ public function revertCheck(string $patch)
             $this->processFactory->create(['git', 'apply', '--reverse', '--check'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new GitDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 

src/Shell/Command/GitDriverException.php

@@ -39,7 +39,7 @@ public function apply(string $patch)
             $this->processFactory->create(['patch', '--silent', '-p1', '--no-backup-if-mismatch'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new PatchDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -53,7 +53,7 @@ public function revert(string $patch)
             $this->processFactory->create(['patch', '--silent', '-p1', '--no-backup-if-mismatch', '--reverse'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new PatchDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -66,7 +66,7 @@ public function applyCheck(string $patch)
             $this->processFactory->create(['patch', '--silent', '-p1', '--dry-run'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new PatchDriverException($exception);
+            throw new DriverException($exception);
         }
     }
 
@@ -79,7 +79,7 @@ public function revertCheck(string $patch)
             $this->processFactory->create(['patch', '--silent', '-p1', '--reverse', '--dry-run'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
-            throw new PatchDriverException($exception);
+            throw new DriverException($exception);
         }
     }