Merge branch 'master' of https://github.com/becoded/PHP_CodeSniffer

Author: gsherwood

CodeSniffer/File.php

@@ -510,21 +510,34 @@ public function start($contents=null)
         // Remove errors and warnings for ignored lines.
         foreach ($this->_ignoredLines as $line => $ignore) {
             if (isset($this->_errors[$line]) === true) {
-                foreach ($this->_errors[$line] as $col => $errors) {
-                    $this->_errorCount -= count($errors);
+                if ($this->_recordErrors === false) {
+                    $this->_errorCount -= $this->_errors[$line];
+                } else {
+                    foreach ($this->_errors[$line] as $col => $errors) {
+                        $this->_errorCount -= count($errors);
+                    }
                 }
 
                 unset($this->_errors[$line]);
             }
 
             if (isset($this->_warnings[$line]) === true) {
-                foreach ($this->_warnings[$line] as $col => $warnings) {
-                    $this->_warningCount -= count($warnings);
+                if ($this->_recordErrors === false) {
+                    $this->_errorCount -= $this->_warnings[$line];
+                } else {
+                    foreach ($this->_warnings[$line] as $col => $warnings) {
+                        $this->_warningCount -= count($warnings);
+                    }
                 }
 
                 unset($this->_warnings[$line]);
             }
         }
+        
+        if ($this->_recordErrors === false) {
+            $this->_errors = array();
+            $this->_warnings = array();
+        }
 
         // If short open tags are off but the file being checked uses
         // short open tags, the whole content will be inline HTML
@@ -768,8 +781,20 @@ public function addError($error, $stackPtr, $code='', $data=array(), $severity=0
             }
         }
 
+        if ($stackPtr === null) {
+            $lineNum = 1;
+            $column = 1;
+        } else {
+            $lineNum = $this->_tokens[$stackPtr]['line'];
+            $column = $this->_tokens[$stackPtr]['column'];
+        }
+
         $this->_errorCount++;
         if ($this->_recordErrors === false) {
+            if (isset($this->_errors[$lineNum]) === false) {
+                $this->_errors[$lineNum] = 0;
+            }
+            $this->_errors[$lineNum]++;
             return;
         }
 
@@ -784,14 +809,6 @@ public function addError($error, $stackPtr, $code='', $data=array(), $severity=0
             $message = vsprintf($error, $data);
         }
 
-        if ($stackPtr === null) {
-            $lineNum = 1;
-            $column  = 1;
-        } else {
-            $lineNum = $this->_tokens[$stackPtr]['line'];
-            $column  = $this->_tokens[$stackPtr]['column'];
-        }
-
         if (isset($this->_errors[$lineNum]) === false) {
             $this->_errors[$lineNum] = array();
         }
@@ -885,8 +902,20 @@ public function addWarning($warning, $stackPtr, $code='', $data=array(), $severi
             }
         }
 
+        if ($stackPtr === null) {
+            $lineNum = 1;
+            $column = 1;
+        } else {
+            $lineNum = $this->_tokens[$stackPtr]['line'];
+            $column = $this->_tokens[$stackPtr]['column'];
+        }
+
         $this->_warningCount++;
         if ($this->_recordErrors === false) {
+            if (isset($this->_warnings[$lineNum]) === false) {
+                $this->_warnings[$lineNum] = 0;
+            }
+            $this->_warnings[$lineNum]++;
             return;
         }
 
@@ -901,14 +930,6 @@ public function addWarning($warning, $stackPtr, $code='', $data=array(), $severi
             $message = vsprintf($warning, $data);
         }
 
-        if ($stackPtr === null) {
-            $lineNum = 1;
-            $column  = 1;
-        } else {
-            $lineNum = $this->_tokens[$stackPtr]['line'];
-            $column  = $this->_tokens[$stackPtr]['column'];
-        }
-
         if (isset($this->_warnings[$lineNum]) === false) {
             $this->_warnings[$lineNum] = array();
         }