Extra test + changelog for #1326

Author: gsherwood

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

@@ -13,4 +13,6 @@ $hello ='foo';
 
 $sum = $a /* + $b */;
 $sum = $a // + $b
-;
+;
+$sum = $a /* + $b
+    + $c */ ;

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

@@ -13,3 +13,6 @@ $hello ='foo';
 
 $sum = $a; /* + $b */
 $sum = $a; // + $b
+
+$sum = $a; /* + $b
+    + $c */

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

@@ -19,4 +19,7 @@ alert('hi');
 var sum = a /* + b */;
 
 var sum = a // +b
-;
+;
+
+var sum = a /* +b
+    + c */ ;

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

@@ -19,3 +19,7 @@ alert('hi');
 var sum = a; /* + b */
 
 var sum = a; // +b
+
+
+var sum = a; /* +b
+    + c */

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

@@ -47,14 +47,15 @@ public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
         switch ($testFile) {
         case 'SemicolonSpacingUnitTest.inc':
             return array(
-                    3 => 1,
-                    4 => 1,
-                    5 => 2,
-                    6 => 1,
-                    8 => 1,
-                    9 => 1,
+                    3  => 1,
+                    4  => 1,
+                    5  => 2,
+                    6  => 1,
+                    8  => 1,
+                    9  => 1,
                     14 => 1,
                     16 => 1,
+                    18 => 1,
                    );
             break;
         case 'SemicolonSpacingUnitTest.js':
@@ -67,6 +68,7 @@ public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
                     13 => 1,
                     19 => 1,
                     22 => 1,
+                    25 => 1,
                    );
             break;
         default:

package.xml

@@ -55,6 +55,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed an error where a nullable type character was detected as an inline then token
     -- A new T_NULLABLE token has been added to represent the ? nullable type character
     -- Thanks to Jaroslav Hanslík for the patch
+  - Squiz.WhiteSpace.SemicolonSpacing no longer removes comments while fixing the placement of semicolons
+    -- Thanks to Algirdas Gurevicius for the patch
   - Fixed bug #1230 : JS tokeniser incorrectly tokenises bitwise shifts as comparison
     -- Thanks to Ryan McCue for the patch
   - Fixed bug #1237 : Uninitialized string offset in PHP Tokenizer on PHP 5.2
@@ -2287,7 +2289,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
         <file baseinstalldir="PHP" name="SemicolonSpacingUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP" name="SemicolonSpacingUnitTest.inc.fixed" role="test" />
         <file baseinstalldir="PHP" name="SemicolonSpacingUnitTest.js" role="test" />
+        <file baseinstalldir="PHP" name="SemicolonSpacingUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP" name="SemicolonSpacingUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>