Merge branch 'master' into report-memory-improvements

Conflicts:
	CodeSniffer/Reports/Junit.php
	CodeSniffer/Reports/Xml.php
	package.xml

Author: gsherwood

CodeSniffer/CLI.php

@@ -307,8 +307,7 @@ public function processLongArgument($arg, $pos, $values)
             exit(0);
             break;
         case 'version':
-            $phpcs = new PHP_CodeSniffer();
-            echo 'PHP_CodeSniffer version '.$phpcs::VERSION.' ('.$phpcs::STABILITY.') ';
+            echo 'PHP_CodeSniffer version '.PHP_CodeSniffer::VERSION.' ('.PHP_CodeSniffer::STABILITY.') ';
             echo 'by Squiz (http://www.squiz.net)'.PHP_EOL;
             exit(0);
             break;

CodeSniffer/Reports/Junit.php

@@ -133,10 +133,9 @@ public function generate(
         $width=80,
         $toScreen=true
     ) {
-        $phpcs    = new PHP_CodeSniffer;
         $failures = ($totalErrors + $totalWarnings);
         echo '<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL;
-        echo '<testsuites name="PHP_CodeSniffer '.$phpcs::VERSION.'" tests="'.$this->_tests.'" failures="'.$failures.'">'.PHP_EOL;
+        echo '<testsuites name="PHP_CodeSniffer '.PHP_CodeSniffer::VERSION.'" tests="'.$this->_tests.'" failures="'.$failures.'">'.PHP_EOL;
         echo $cachedData;
         echo '</testsuites>'.PHP_EOL;
 

CodeSniffer/Reports/Xml.php

@@ -115,9 +115,8 @@ public function generate(
         $width=80,
         $toScreen=true
     ) {
-        $phpcs = new PHP_CodeSniffer;
         echo '<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL;
-        echo '<phpcs version="'.$phpcs::VERSION.'">'.PHP_EOL;
+        echo '<phpcs version="'.PHP_CodeSniffer::VERSION.'">'.PHP_EOL;
         echo $cachedData;
         echo '</phpcs>'.PHP_EOL;
 

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>
   - Fixed bug #20093 : Bug with ternary operator token
+  - Fixed bug #20097 : CLI.php throws error in php 5.2
   - Fixed bug #20100 : incorrect Function mysql() has been deprecated report
  </notes>
  <contents>