Fixed bug #605 : Auto report-width specified in ruleset.xml ignored

Author: gsherwood

CodeSniffer/CLI.php

@@ -321,7 +321,7 @@ public function getDefaults()
 
         $reportWidth = PHP_CodeSniffer::getConfigData('report_width');
         if ($reportWidth !== null) {
-            $defaults['reportWidth'] = $reportWidth;
+            $defaults['reportWidth'] = $this->_validateReportWidth($reportWidth);
         } else {
             // Use function defaults.
             $defaults['reportWidth'] = null;
@@ -374,18 +374,6 @@ public function getCommandLineValues()
         array_shift($args);
 
         $this->setCommandLineValues($args);
-
-        // Support auto temrinal width.
-        if (isset($this->values['reportWidth']) === true) {
-            if ($this->values['reportWidth'] === 'auto'
-                && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1
-            ) {
-                $this->values['reportWidth'] = (int) $matches[1];
-            } else {
-                $this->values['reportWidth'] = (int) $this->values['reportWidth'];
-            }
-        }
-
         return $this->values;
 
     }//end getCommandLineValues()
@@ -644,7 +632,7 @@ public function processLongArgument($arg, $pos)
                     }
                 }
             } else if (substr($arg, 0, 13) === 'report-width=') {
-                $this->values['reportWidth'] = substr($arg, 13);
+                $this->values['reportWidth'] = $this->_validateReportWidth(substr($arg, 13));
             } else if (substr($arg, 0, 7) === 'report='
                 || substr($arg, 0, 7) === 'report-'
             ) {
@@ -1267,4 +1255,25 @@ public function printInstalledStandards()
     }//end printInstalledStandards()
 
 
+    /**
+     * Set report width based on terminal width.
+     *
+     * @param int $width The width of the report. If "auto" then will
+     *                   be replaced by the terminal width.
+     *
+     * @return void
+     */
+    private function _validateReportWidth($width)
+    {
+        if ($width === 'auto'
+            && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1
+        ) {
+            return (int) $matches[1];
+        }
+
+        return (int) $width;
+
+    }//end _validateReportWidth()
+
+
 }//end class

package.xml

@@ -45,6 +45,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Klaus Purer for the patch
   - Fixed bug #598 : PHPCBF can break function/use closure brace placement
   - Fixed bug #603 : Squiz ControlSignatureSniff hard-codes opener type while fixing
+  - Fixed bug #605 : Auto report-width specified in ruleset.xml ignored
   - Fixed bug #611 : Invalid numeric literal on CSS files under PHP7
   - Fixed bug #612 : Multi-file diff generating incorrectly if files do not end with EOL char
   - Fixed bug #615 : Squiz OperatorBracketSniff incorrectly reports and fixes operations using self::