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

- Remove -f flag in patch command
- Fix services configuration

Author: bubasuma

config/services.xml

@@ -29,6 +29,8 @@
         <service id="Magento\CloudPatches\Patch\Pool\RequiredPool" lazy="true"/>
         <service id="Magento\CloudPatches\Patch\Pool\LocalPool" lazy="true"/>
         <service id="Magento\CloudPatches\Patch\Status\StatusPool" 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">
             <argument key="$resolvers" type="collection">
                 <argument type="service" id="Magento\CloudPatches\Patch\Status\LocalResolver"/>
@@ -84,8 +86,5 @@
                 <argument type="service" id="Magento\CloudPatches\Shell\Command\PatchDriver"/>
             </argument>
         </service>
-        <service id="Magento\CloudPatches\Patch\Applier">
-            <argument key="$patchCommand" type="service" id="patchCommand"/>
-        </service>
     </services>
 </container>

src/Shell/Command/PatchDriver.php

@@ -37,7 +37,7 @@ public function apply(string $patch)
     {
         try {
             $this->applyCheck($patch);
-            $this->processFactory->create(['patch', '--silent', '-f', '-p1'], $patch)
+            $this->processFactory->create(['patch', '--silent', '-p1', '--no-backup-if-mismatch'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
             throw new PatchCommandException('Failed to apply patch', $exception->getCode(), $exception);
@@ -51,7 +51,7 @@ public function revert(string $patch)
     {
         try {
             $this->revertCheck($patch);
-            $this->processFactory->create(['patch', '--silent', '-f', '-p1', '--reverse'], $patch)
+            $this->processFactory->create(['patch', '--silent', '-p1', '--no-backup-if-mismatch', '--reverse'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
             throw new PatchCommandException('Failed to revert patch', $exception->getCode(), $exception);
@@ -64,7 +64,7 @@ public function revert(string $patch)
     public function applyCheck(string $patch)
     {
         try {
-            $this->processFactory->create(['patch', '--silent', '-f', '-p1', '--dry-run'], $patch)
+            $this->processFactory->create(['patch', '--silent', '-p1', '--dry-run'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
             throw new PatchCommandException('Patch cannot be applied', $exception->getCode(), $exception);
@@ -77,7 +77,7 @@ public function applyCheck(string $patch)
     public function revertCheck(string $patch)
     {
         try {
-            $this->processFactory->create(['patch', '--silent', '-f', '-p1', '--reverse', '--dry-run'], $patch)
+            $this->processFactory->create(['patch', '--silent', '-p1', '--reverse', '--dry-run'], $patch)
                 ->mustRun();
         } catch (ProcessFailedException $exception) {
             throw new PatchCommandException('Patch cannot be reverted', $exception->getCode(), $exception);