- Update error message

Author: viktym

src/Command/Process/ApplyLocal.php

@@ -89,7 +89,7 @@ public function run(InputInterface $input, OutputInterface $output)
                 $this->printInfo($output, $message);
                 array_push($appliedPatches, $patch);
             } catch (ApplierException $exception) {
-                $this->printError($output, 'Error: patch conflict happened');
+                $this->printError($output, 'Error: patch can\'t be applied');
                 $messages = $this->rollbackProcessor->process($appliedPatches);
                 $output->writeln($messages);
                 $errorMessage = sprintf(

src/Patch/Conflict/Processor.php

@@ -73,7 +73,7 @@ public function process(
         array $appliedPatches,
         string $exceptionMessage
     ) {
-        $errorMessage = 'Error: patch conflict happened';
+        $errorMessage = 'Error: patch can\'t be applied';
         $this->logger->error($errorMessage);
         $output->writeln('<error>' . $errorMessage . '</error>');
 
@@ -84,7 +84,7 @@ public function process(
             'Applying patch %s (%s) failed.%s%s',
             $patch->getId(),
             $patch->getPath(),
-            PHP_EOL. $exceptionMessage,
+            PHP_EOL . $exceptionMessage,
             $conflictDetails ? PHP_EOL . $conflictDetails : ''
         );
 

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

@@ -92,7 +92,7 @@ public function testProcess()
         $outputMock->expects($this->exactly(2))
             ->method('writeln')
             ->withConsecutive(
-                [$this->stringContains('Error: patch conflict happened')],
+                [$this->stringContains('Error: patch can\'t be applied')],
                 [$rollbackMessages]
             );