Merge branch 'patch-1' of https://github.com/thiemowmde/PHP_CodeSniffer

Author: gsherwood

src/Tokenizers/Tokenizer.php

@@ -638,25 +638,13 @@ public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth
                 }
 
                 // Process the tab that comes after the content.
-                $lastCurrColumn = $currColumn;
                 $tabNum++;
 
                 // Move the pointer to the next tab stop.
-                if (($currColumn % $tabWidth) === 0) {
-                    // This is the first tab, and we are already at a
-                    // tab stop, so this tab counts as a single space.
-                    $currColumn++;
-                } else {
-                    $currColumn++;
-                    while (($currColumn % $tabWidth) !== 0) {
-                        $currColumn++;
-                    }
-
-                    $currColumn++;
-                }
-
-                $length     += ($currColumn - $lastCurrColumn);
-                $newContent .= $prefix.str_repeat($padding, ($currColumn - $lastCurrColumn - 1));
+                $pad         = ($tabWidth - ($currColumn + $tabWidth - 1) % $tabWidth);
+                $currColumn += $pad;
+                $length     += $pad;
+                $newContent .= $prefix.str_repeat($padding, ($pad - 1));
             }//end foreach
         }//end if