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

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php

@@ -88,10 +88,15 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
         if ($fix === true) {
             $phpcsFile->fixer->beginChangeset();
-            for ($i = ($stackPtr - 1); $i > $nonSpace; $i--) {
+            $i = ($stackPtr - 1);
+            while (($tokens[$i]['code'] === T_WHITESPACE) && ($i > $nonSpace)) {
                 $phpcsFile->fixer->replaceToken($i, '');
+                $i--;
             }
 
+            $phpcsFile->fixer->addContent($nonSpace, ';');
+            $phpcsFile->fixer->replaceToken($stackPtr, '');
+
             $phpcsFile->fixer->endChangeset();
         }
 

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc

@@ -9,4 +9,8 @@ $test = $this->testThis()  /* comment here */;
 $test = $this->testThis()  /* comment here */  ;
 
 $hello ='foo';
+;
+
+$sum = $a /* + $b */;
+$sum = $a // + $b
 ;

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc.fixed

@@ -0,0 +1,15 @@
+<?php
+$test = $this->testThis();
+$test = $this->testThis();
+$test = $this->testThis();
+for ($var = 1; $var < 10; $var++) {
+    echo $var;
+}
+$test = $this->testThis();  /* comment here */
+$test = $this->testThis();  /* comment here */
+
+$hello ='foo';
+;
+
+$sum = $a; /* + $b */
+$sum = $a; // + $b

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js

@@ -14,4 +14,9 @@ for (i=0   ; i<3 ; i++) {
    }
 }
 alert('hi');
+;
+
+var sum = a /* + b */;
+
+var sum = a // +b
 ;

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js.fixed

@@ -0,0 +1,21 @@
+var x = {
+    a: function () {
+        alert('thats right');
+        x = (x?a:x);
+    },
+};
+
+id = id.replace(/row\/:;/gi, '');
+
+for (i=0; i<3; i++) {
+   for (j=0; j<5; j++) {
+      if (j==x)
+         break;
+   }
+}
+alert('hi');
+;
+
+var sum = a; /* + b */
+
+var sum = a; // +b

CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php

@@ -53,6 +53,8 @@ public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
                     6 => 1,
                     8 => 1,
                     9 => 1,
+                    14 => 1,
+                    16 => 1,
                    );
             break;
         case 'SemicolonSpacingUnitTest.js':
@@ -63,6 +65,8 @@ public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
                     10 => 2,
                     11 => 1,
                     13 => 1,
+                    19 => 1,
+                    22 => 1,
                    );
             break;
         default: