MAGECLOUD-1186: No exception on patching error (#70)

Author: shiftedreality

src/Process/Build/ApplyPatches.php

@@ -5,7 +5,8 @@
  */
 namespace Magento\MagentoCloud\Process\Build;
 
-use Magento\MagentoCloud\Package\MagentoVersion;
+use Magento\MagentoCloud\Filesystem\DirectoryList;
+use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Psr\Log\LoggerInterface;
@@ -26,23 +27,31 @@ class ApplyPatches implements ProcessInterface
     private $logger;
 
     /**
-     * @var MagentoVersion
+     * @var File
      */
-    private $magentoVersion;
+    private $file;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
 
     /**
      * @param ShellInterface $shell
      * @param LoggerInterface $logger
-     * @param MagentoVersion $magentoVersion
+     * @param File $file
+     * @param DirectoryList $directoryList
      */
     public function __construct(
         ShellInterface $shell,
         LoggerInterface $logger,
-        MagentoVersion $magentoVersion
+        File $file,
+        DirectoryList $directoryList
     ) {
         $this->shell = $shell;
         $this->logger = $logger;
-        $this->magentoVersion = $magentoVersion;
+        $this->file = $file;
+        $this->directoryList = $directoryList;
     }
 
     /**
@@ -52,12 +61,14 @@ public function execute()
     {
         $this->logger->info('Applying patches.');
 
-        try {
-            if ($this->magentoVersion->isGreaterOrEqual('2.2')) {
-                $this->shell->execute('php vendor/bin/m2-apply-patches');
-            }
-        } catch (\Exception $exception) {
-            $this->logger->warning('Patching was failed. Skipping.');
+        $patchScript = $this->directoryList->getMagentoRoot() . '/vendor/bin/m2-apply-patches';
+
+        if (!$this->file->isExists($patchScript)) {
+            $this->logger->warning('Package with patches was not found.');
+
+            return;
         }
+
+        $this->shell->execute('php ' . $patchScript);
     }
 }

src/Test/Unit/Process/Build/ApplyPatchesTest.php

@@ -5,7 +5,8 @@
  */
 namespace Magento\MagentoCloud\Test\Unit\Process\Build;
 
-use Magento\MagentoCloud\Package\MagentoVersion;
+use Magento\MagentoCloud\Filesystem\DirectoryList;
+use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\Build\ApplyPatches;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use PHPUnit\Framework\TestCase;
@@ -33,9 +34,14 @@ class ApplyPatchesTest extends TestCase
     private $shellMock;
 
     /**
-     * @var MagentoVersion|Mock
+     * @var File|Mock
      */
-    private $magentoVersionMock;
+    private $fileMock;
+
+    /**
+     * @var DirectoryList|Mock
+     */
+    private $directoryListMock;
 
     /**
      * @inheritdoc
@@ -46,48 +52,53 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->shellMock = $this->getMockBuilder(ShellInterface::class)
             ->getMockForAbstractClass();
-        $this->magentoVersionMock = $this->getMockBuilder(MagentoVersion::class)
+        $this->fileMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->directoryListMock = $this->createMock(DirectoryList::class);
 
         $this->process = new ApplyPatches(
             $this->shellMock,
             $this->loggerMock,
-            $this->magentoVersionMock
+            $this->fileMock,
+            $this->directoryListMock
         );
 
         parent::setUp();
     }
 
     public function testExecute()
     {
+        $this->directoryListMock->method('getMagentoRoot')
+            ->willReturn('magento_root');
         $this->loggerMock->expects($this->once())
             ->method('info')
             ->with('Applying patches.');
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('php vendor/bin/m2-apply-patches');
-        $this->magentoVersionMock->method('isGreaterOrEqual')
-            ->with('2.2')
+            ->with('php magento_root/vendor/bin/m2-apply-patches');
+        $this->fileMock->method('isExists')
+            ->with('magento_root/vendor/bin/m2-apply-patches')
             ->willReturn(true);
 
         $this->process->execute();
     }
 
     public function testExecuteWithoutPatches()
     {
+        $this->directoryListMock->method('getMagentoRoot')
+            ->willReturn('magento_root');
         $this->loggerMock->expects($this->once())
             ->method('info')
             ->with('Applying patches.');
-        $this->magentoVersionMock->method('isGreaterOrEqual')
-            ->with('2.2')
-            ->willReturn(true);
+        $this->fileMock->method('isExists')
+            ->with('magento_root/vendor/bin/m2-apply-patches')
+            ->willReturn(false);
         $this->loggerMock->expects($this->once())
             ->method('warning')
-            ->with('Patching was failed. Skipping.');
-        $this->shellMock->expects($this->once())
-            ->method('execute')
-            ->willThrowException(new \Exception('Patching failed.'));
+            ->with('Package with patches was not found.');
+        $this->shellMock->expects($this->never())
+            ->method('execute');
 
         $this->process->execute();
     }