Merge branch 'feature/report-full-fix-message-with-linebreaks' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Reports/Full.php

@@ -114,27 +114,40 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
 
         // The maximum amount of space an error message can use.
         $maxErrorSpace = ($width - $paddingLength - 1);
-        if ($showSources === true) {
-            // Account for the chars used to print colors.
-            $maxErrorSpace += 8;
-        }
 
         foreach ($report['messages'] as $line => $lineErrors) {
             foreach ($lineErrors as $column => $colErrors) {
                 foreach ($colErrors as $error) {
-                    $message = $error['message'];
-                    $message = str_replace("\n", "\n".$paddingLine2, $message);
-                    if ($showSources === true) {
-                        $message = "\033[1m".$message."\033[0m".' ('.$error['source'].')';
+                    $message  = $error['message'];
+                    $msgLines = [$message];
+                    if (strpos($message, "\n") !== false) {
+                        $msgLines = explode("\n", $message);
+                    }
+
+                    $errorMsg = '';
+                    $lastLine = (count($msgLines) - 1);
+                    foreach ($msgLines as $k => $msgLine) {
+                        if ($k === 0) {
+                            if ($showSources === true) {
+                                $errorMsg .= "\033[1m";
+                            }
+                        } else {
+                            $errorMsg .= PHP_EOL.$paddingLine2;
+                        }
+
+                        if ($k === $lastLine && $showSources === true) {
+                            $msgLine .= "\033[0m".' ('.$error['source'].')';
+                        }
+
+                        $errorMsg .= wordwrap(
+                            $msgLine,
+                            $maxErrorSpace,
+                            PHP_EOL.$paddingLine2
+                        );
                     }
 
                     // The padding that goes on the front of the line.
-                    $padding  = ($maxLineNumLength - strlen($line));
-                    $errorMsg = wordwrap(
-                        $message,
-                        $maxErrorSpace,
-                        PHP_EOL.$paddingLine2
-                    );
+                    $padding = ($maxLineNumLength - strlen($line));
 
                     echo ' '.str_repeat(' ', $padding).$line.' | ';
                     if ($error['type'] === 'ERROR') {