Prints error message when rejecting commit

src/Task/Git/CommitMessage.php

@@ -20,7 +20,7 @@
 
 class CommitMessage implements TaskInterface
 {
-    const MERGE_COMMIT_REGEX =
+    public const MERGE_COMMIT_REGEX =
         '(Merge branch|tag \'.+\'(?:\s.+)?|Merge remote-tracking branch \'.+\'|Merge pull request #\d+\s.+)';
 
     /**
@@ -93,6 +93,18 @@ public function canRunInContext(ContextInterface $context): bool
         return $context instanceof GitCommitMsgContext;
     }
 
+    private static function withCommitMessage(string $errorMessage, string $commitMessage): string
+    {
+        return sprintf(
+            "%s%sOriginal commit message:%s%s",
+            $errorMessage,
+            PHP_EOL,
+            PHP_EOL,
+            $commitMessage
+        );
+    }
+
+
     public function run(ContextInterface $context): TaskResultInterface
     {
         assert($context instanceof GitCommitMsgContext);
@@ -110,39 +122,39 @@ public function run(ContextInterface $context): TaskResultInterface
             return TaskResult::createFailed(
                 $this,
                 $context,
-                'Commit message should not be empty.'
+                self::withCommitMessage('Commit message should not be empty.', $commitMessage),
             );
         }
 
         if ((bool) $config['enforce_capitalized_subject'] && !$this->subjectIsCapitalized($context)) {
             return TaskResult::createFailed(
                 $this,
                 $context,
-                'Subject should start with a capital letter.'
+                self::withCommitMessage('Subject should start with a capital letter.', $commitMessage)
             );
         }
 
         if ((bool) $config['enforce_single_lined_subject'] && !$this->subjectIsSingleLined($context)) {
             return TaskResult::createFailed(
                 $this,
                 $context,
-                'Subject should be one line and followed by a blank line.'
+                self::withCommitMessage('Subject should be one line and followed by a blank line.', $commitMessage)
             );
         }
 
         if ((bool) $config['enforce_no_subject_punctuations'] && $this->subjectHasPunctuations($context)) {
             return TaskResult::createFailed(
                 $this,
                 $context,
-                'Please omit all punctuations from commit message subject.'
+                self::withCommitMessage('Please omit all punctuations from commit message subject.', $commitMessage)
             );
         }
 
         if ((bool) $config['enforce_no_subject_trailing_period'] && $this->subjectHasTrailingPeriod($context)) {
             return TaskResult::createFailed(
                 $this,
                 $context,
-                'Please omit trailing period from commit message subject.'
+                self::withCommitMessage('Please omit trailing period from commit message subject.', $commitMessage)
             );
         }
 
@@ -166,11 +178,7 @@ public function run(ContextInterface $context): TaskResultInterface
             return TaskResult::createFailed(
                 $this,
                 $context,
-                implode(PHP_EOL, $exceptions).PHP_EOL.sprintf(
-                    'Original commit message: %s%s',
-                    PHP_EOL,
-                    $commitMessage
-                )
+                self::withCommitMessage(implode(PHP_EOL, $exceptions), $commitMessage)
             );
         }
 
@@ -211,7 +219,11 @@ private function enforceTextWidth(GitCommitMsgContext $context): TaskResult
         }
 
         if (\count($errors)) {
-            return TaskResult::createFailed($this, $context, implode(PHP_EOL, $errors));
+            return TaskResult::createFailed(
+                $this,
+                $context,
+                self::withCommitMessage(implode(PHP_EOL, $errors), $commitMessage)
+            );
         }
 
         return TaskResult::createPassed($this, $context);

test/Unit/Task/Git/CommitMessageTest.php

@@ -206,6 +206,32 @@ function () {
                 'Line 5 of commit message has > 10 characters.'
             )
         ];
+        yield 'enforce_text_with_regular_gives_back_message' => [
+            [
+                'enforce_single_lined_subject' => false,
+                'max_subject_width' => 10,
+                'max_body_width' => 10,
+            ],
+            $this->mockCommitMsgContext($this->buildMessage(
+                'Subject 1234567891011',
+                'Body 1234567891011',
+                'Body ok',
+                'Body 1110987654321'
+            )),
+            function () {
+            },
+            $this->buildMultiLineString(
+                'Please keep the subject <= 10 characters.',
+                'Line 3 of commit message has > 10 characters.',
+                'Line 5 of commit message has > 10 characters.',
+                'Original commit message:',
+                'Subject 1234567891011',
+                '',
+                'Body 1234567891011',
+                'Body ok',
+                'Body 1110987654321'
+            )
+        ];
         yield 'enforce_text_with_long_comments' => [
             [
                 'enforce_single_lined_subject' => false,
@@ -309,7 +335,7 @@ function () {
                 'Rule not matched: "4" /(.*)st$/',
                 'Rule not matched: "5" /t(e|a)st/',
                 'Rule not matched: "6" TEST',
-                'Original commit message: ',
+                'Original commit message:',
                 'invalid'
             )
         ];
@@ -327,7 +353,7 @@ function () {
             $this->buildMultiLineString(
                 'Rule not matched: "full" test',
                 'Rule not matched: "partial" *es*',
-                'Original commit message: ',
+                'Original commit message:',
                 'invalid'
             )
         ];
@@ -342,7 +368,7 @@ function () {
             },
             $this->buildMultiLineString(
                 'Rule not matched: "0" /TEST/',
-                'Original commit message: ',
+                'Original commit message:',
                 'test'
             )
         ];