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

bubasuma · bubasuma · commit e4a801d307d6 · 2020-09-21T17:00:46.000-05:00
diff --git a/config/services.xml b/config/services.xml
@@ -20,6 +20,7 @@
         <service id="Magento\CloudPatches\Patch\PatchIntegrityException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\Pool\PatchNotFoundException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\PatchCommandNotFound" autowire="false"/>
+        <service id="Magento\CloudPatches\Patch\PatchCommandException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\ApplierException" autowire="false"/>
         <service id="Magento\CloudPatches\Shell\PackageNotFoundException" autowire="false"/>
         <service id="Magento\CloudPatches\Patch\Data\Patch" autowire="false"/>
diff --git a/src/Patch/PatchCommand.php b/src/Patch/PatchCommand.php
@@ -63,14 +63,6 @@ public function revertCheck(string $patch)
         $this->getCommand()->revertCheck($patch);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isInstalled(): bool
-    {
-        return $this->getCommand()->isInstalled();
-    }
-
     /**
      * Return first available command
      *

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,6 @@ public function revertCheck(string $patch)`
`63`	`63`	`$this->getCommand()->revertCheck($patch);`
`64`	`64`	`}`
`65`	`65`
`66`		`- /**`
`67`		`- * @inheritDoc`
`68`		`- */`
`69`		`- public function isInstalled(): bool`
`70`		`- {`
`71`		`- return $this->getCommand()->isInstalled();`
`72`		`- }`
`73`		`-`
`74`	`66`	`/**`
`75`	`67`	`* Return first available command`
`76`	`68`	`*`