Merge branch 'patch-3' of https://github.com/ssontakke/PHP_CodeSniffer

kartik-v · May 22, 2016 · 675e093 · 675e093
2 parents 76ae826 + 56b0418
commit 675e093
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/CodeSniffer/File.php b/CodeSniffer/File.php
@@ -993,7 +993,6 @@ private function _addError($error, $line, $column, $code, $data, $severity, $fix
         // Work out which sniff generated the error.
         if (substr($code, 0, 9) === 'Internal.') {
             // Any internal message.
-            $sniff     = $code;
             $sniffCode = $code;
         } else {
             $parts = explode('_', str_replace('\\', '_', $this->_activeListener));
@@ -1141,7 +1140,6 @@ private function _addWarning($warning, $line, $column, $code, $data, $severity,
         // Work out which sniff generated the warning.
         if (substr($code, 0, 9) === 'Internal.') {
             // Any internal message.
-            $sniff     = $code;
             $sniffCode = $code;
         } else {
             $parts = explode('_', str_replace('\\', '_', $this->_activeListener));
@@ -1321,7 +1319,7 @@ public function getWarningCount()
 
 
     /**
-     * Returns the number of successes recorded.
+     * Returns the number of successes recorded. Currently not in use.
      *
      * @return int
      */
@@ -1829,10 +1827,6 @@ private static function _createScopeMap(&$tokens, $tokenizer, $eolChar)
     {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START SCOPE MAP ***".PHP_EOL;
-            $isWin = false;
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                $isWin = true;
-            }
         }
 
         $numTokens = count($tokens);
@@ -1896,11 +1890,6 @@ private static function _recurseScopeMap(
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo str_repeat("\t", $depth);
             echo "=> Begin scope map recursion at token $stackPtr with depth $depth".PHP_EOL;
-
-            $isWin = false;
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                $isWin = true;
-            }
         }
 
         $opener    = null;