MC-40529: 'Git apply' command silently fails to apply the patch in some environments (#17)

Author: viktym

src/Command/Apply.php

@@ -83,12 +83,13 @@ protected function configure()
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->logger->notice($this->magentoVersion->get());
+        $this->logger->info($this->magentoVersion->get());
 
         try {
             $this->applyOptional->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $this->logger->info($this->magentoVersion->get());
             $this->logger->error($e->getMessage());
 
             return self::RETURN_FAILURE;

src/Command/Ece/Apply.php

@@ -91,14 +91,15 @@ protected function configure()
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->logger->notice($this->magentoVersion->get());
+        $this->logger->info($this->magentoVersion->get());
 
         try {
             $this->applyRequired->run($input, $output);
             $this->applyOptional->run($input, $output);
             $this->applyLocal->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $this->logger->info($this->magentoVersion->get());
             $this->logger->error($e->getMessage());
 
             return self::RETURN_FAILURE;

src/Command/Ece/Revert.php

@@ -73,12 +73,13 @@ protected function configure()
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->logger->notice($this->magentoVersion->get());
+        $this->logger->info($this->magentoVersion->get());
 
         try {
             $this->revert->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $this->logger->info($this->magentoVersion->get());
             $this->logger->error($e->getMessage());
 
             return self::RETURN_FAILURE;

src/Command/Revert.php

@@ -96,12 +96,13 @@ protected function configure()
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->logger->notice($this->magentoVersion->get());
+        $this->logger->info($this->magentoVersion->get());
 
         try {
             $this->revert->run($input, $output);
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $this->logger->info($this->magentoVersion->get());
             $this->logger->error($e->getMessage());
 
             return self::RETURN_FAILURE;

src/Patch/Applier.php

@@ -175,6 +175,23 @@ private function prepareContent(string $content): string
             $content = $this->gitConverter->convert($content);
         }
 
+        $content = $this->replaceDiffGit($content);
+
         return $content;
     }
+
+    /**
+     * Replace `diff --git`
+     *
+     * In some environments 'git apply' command skips applying a patch
+     * while execution inside the git working tree. To prevent this issue
+     * we need to replace `diff --git` with `diff -Nuar` in the patch source.
+     *
+     * @param string $content
+     * @return string
+     */
+    private function replaceDiffGit(string $content): string
+    {
+        return preg_replace(['/^diff --git/', '/\ndiff --git/'], ['diff -Nuar', "\ndiff -Nuar"], $content);
+    }
 }

src/Test/Unit/Patch/ApplierTest.php

@@ -278,4 +278,43 @@ public function testStatusApplied()
 
         $this->assertSame(StatusPool::APPLIED, $this->applier->status($patchContent));
     }
+
+    /**
+     * Tests checkApply operation.
+     *
+     * Verifies that 'diff --git' is replaced with 'diff -Nuar'
+     */
+    public function testCheckApply()
+    {
+        $patchContent = 'diff --git a/vendor/module-deploy/Queue.php b/vendor/module-deploy/Queue.php
+--- a/vendor/magento/module-deploy/Process/Queue.php
++++ b/vendor/magento/module-deploy/Process/Queue.php
+diff --git a/vendor/magento/module-email/Model/Transport.php b/vendor/magento/module-email/Model/Transport.php
+--- a/vendor/magento/module-email/Model/Transport.php
++++ b/vendor/magento/module-email/Model/Transport.php
+-        echo "diff --git";
++        echo "diff --Nuar";
+diff -Nuar a/vendor/magento/module-email/Model/Transport.php b/vendor/magento/module-email/Model/Transport.php
+';
+        $expectedPatchContent = 'diff -Nuar a/vendor/module-deploy/Queue.php b/vendor/module-deploy/Queue.php
+--- a/vendor/magento/module-deploy/Process/Queue.php
++++ b/vendor/magento/module-deploy/Process/Queue.php
+diff -Nuar a/vendor/magento/module-email/Model/Transport.php b/vendor/magento/module-email/Model/Transport.php
+--- a/vendor/magento/module-email/Model/Transport.php
++++ b/vendor/magento/module-email/Model/Transport.php
+-        echo "diff --git";
++        echo "diff --Nuar";
+diff -Nuar a/vendor/magento/module-email/Model/Transport.php b/vendor/magento/module-email/Model/Transport.php
+';
+
+        $this->magentoVersion->expects($this->once())
+            ->method('isGitBased')
+            ->willReturn(false);
+
+        $this->patchCommand->expects($this->once())
+            ->method('applyCheck')
+            ->with($expectedPatchContent);
+
+        $this->assertTrue($this->applier->checkApply($patchContent));
+    }
 }