Merge pull request SnapInteractive#8 from rhowardiv/nonl

Remove line breaks from error/warning messages
rhowardiv · Feb 15, 2013 · 28594da · 28594da
2 parents a6aee2d + bad5553
commit 28594da
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/CodeSniffer/File.php b/CodeSniffer/File.php
@@ -806,7 +806,11 @@ public function addError($error, $stackPtr, $code='', $data=array(), $severity=0
         if (empty($data) === true) {
             $message = $error;
         } else {
-            $message = vsprintf($error, $data);
+            $message = str_replace(
+                array("\r", "\n"),
+                array('\r', '\n'),
+                vsprintf($error, $data)
+            );
         }
 
         if (isset($this->_errors[$lineNum]) === false) {
@@ -927,7 +931,11 @@ public function addWarning($warning, $stackPtr, $code='', $data=array(), $severi
         if (empty($data) === true) {
             $message = $warning;
         } else {
-            $message = vsprintf($warning, $data);
+            $message = str_replace(
+                array("\r", "\n"),
+                array('\r', '\n'),
+                vsprintf($warning, $data)
+            );
         }
 
         if (isset($this->_warnings[$lineNum]) === false) {