Fixed bug #20200 : Invalid JSON produced with specific error messag

andrewkett · Feb 19, 2014 · 9da6470 · 9da6470
1 parent 2679192
commit 9da6470
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CodeSniffer/Reports/Json.php b/CodeSniffer/Reports/Json.php
@@ -49,16 +49,17 @@ public function generateFileReport(
         $showSources=false,
         $width=80
     ) {
-
-        $filename = str_replace('"', '\"', $report['filename']);
-        $filename = str_replace('/', '\/', $report['filename']);
+        $filename = str_replace('\\', '\\\\', $report['filename']);
+        $filename = str_replace('"', '\"', $filename);
+        $filename = str_replace('/', '\/', $filename);
         echo "\"$filename\":{";
         echo '"errors":'.$report['errors'].',"warnings":'.$report['warnings'].',"messages":[';
 
         $messages = '';
         foreach ($report['messages'] as $line => $lineErrors) {
             foreach ($lineErrors as $column => $colErrors) {
                 foreach ($colErrors as $error) {
+                    $error['message'] = str_replace('\\', '\\\\', $error['message']);
                     $error['message'] = str_replace('"', '\"', $error['message']);
                     $error['message'] = str_replace('/', '\/', $error['message']);
 

diff --git a/package.xml b/package.xml
@@ -27,6 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
   - Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
+  - Fixed bug #20200 : Invalid JSON produced with specific error message
  </notes>
  <contents>
   <dir name="/">