Fixed the svn pre-commit hook. This required the processFile method to do its own report caching.

Author: gsherwood

CodeSniffer.php

@@ -466,9 +466,6 @@ public function process($files, $standards, array $restrictions=array(), $local=
             $phpcsFile = $this->processFile($file);
             $numProcessed++;
 
-            // Cache the report data for this file so we can unset it to save memory.
-            $this->reporting->cacheFileReport($phpcsFile, $cliValues);
-
             if (PHP_CODESNIFFER_VERBOSITY > 0
                 || PHP_CODESNIFFER_INTERACTIVE === true
                 || $showProgress === false
@@ -1308,7 +1305,11 @@ public function processFile($file, $contents=null)
             $phpcsFile->addError($error, null);
         }//end try
 
+        $cliValues = $this->cli->getCommandLineValues();
+
         if (PHP_CODESNIFFER_INTERACTIVE === false) {
+            // Cache the report data for this file so we can unset it to save memory.
+            $this->reporting->cacheFileReport($phpcsFile, $cliValues);
             return $phpcsFile;
         }
 
@@ -1317,8 +1318,6 @@ public function processFile($file, $contents=null)
             Print the error report for the current file and then wait for user input.
         */
 
-        $cliValues = $this->cli->getCommandLineValues();
-
         // Get current violations and then clear the list to make sure
         // we only print violations for a single file each time.
         $numErrors = null;

CodeSniffer/Reporting.php

@@ -114,6 +114,12 @@ public function factory($type)
      */
     public function cacheFileReport(PHP_CodeSniffer_File $phpcsFile, array $cliValues)
     {
+        if (isset($cliValues['reports']) === false) {
+            // This happens during unit testing, or any time someone just wants
+            // the error data and not the printed report.
+            return;
+        }
+
         $reportData  = $this->prepareFileReport($phpcsFile);
         $errorsShown = false;
 

scripts/phpcs-svn-pre-commit

@@ -107,12 +107,14 @@ class PHP_CodeSniffer_SVN_Hook extends PHP_CodeSniffer_CLI
         $contents = preg_replace('/^.{4}/m', null, $contents);
 
         $values['standard'] = $this->validateStandard($values['standard']);
-        if (PHP_CodeSniffer::isInstalledStandard($values['standard']) === false) {
-            // They didn't select a valid coding standard, so help them
-            // out by letting them know which standards are installed.
-            echo 'ERROR: the "'.$values['standard'].'" coding standard is not installed. ';
-            $this->printInstalledStandards();
-            exit(2);
+        foreach ($values['standard'] as $standard) {
+            if (PHP_CodeSniffer::isInstalledStandard($standard) === false) {
+                // They didn't select a valid coding standard, so help them
+                // out by letting them know which standards are installed.
+                echo 'ERROR: the "'.$standard.'" coding standard is not installed. ';
+                $this->printInstalledStandards();
+                exit(2);
+            }
         }
 
         $phpcs = new PHP_CodeSniffer(