ACP2E-138: PHP error 'Undefined variable: errorMessage' when conflict happens during a patch applying (#43)

Author: viktym

src/Patch/Conflict/Analyzer.php

@@ -88,6 +88,7 @@ public function analyze(PatchInterface $failedPatch, array $patchFilter = []): s
      */
     private function analyzeOptional(string $failedPatchId, array $patchFilter = []): string
     {
+        $errorMessage = '';
         $optionalPatchIds = $patchFilter ?: $this->optionalPool->getIdsByType(PatchInterface::TYPE_OPTIONAL);
         $ids = $this->getIncompatiblePatches($optionalPatchIds, $failedPatchId);
         if ($ids) {

src/Test/Unit/Patch/Conflict/AnalyzerTest.php

@@ -143,6 +143,14 @@ public function analyzeDataProvider(): array
                 ],
                 'expectedMessage' => 'Patch MC-1 can\'t be applied to clean Magento instance'
             ],
+            [
+                'checkApplyMap' => [
+                    [['REQUIRED-1', 'REQUIRED-2', 'MC-1'], true],
+                    [['OPTIONAL-1', 'MC-1'], true],
+                    [['OPTIONAL-2', 'MC-1'], true],
+                ],
+                'expectedMessage' => ''
+            ],
         ];
     }