Squiz CommentedOutCodeSniff is now better at ignoring URLs inside comments

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php

@@ -157,6 +157,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                         T_STRING_CONCAT           => true,
                         T_ENCAPSED_AND_WHITESPACE => true,
                         T_NONE                    => true,
+                        T_COMMENT                 => true,
                        );
 
         $numTokens = count($stringTokens);
@@ -198,6 +199,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $numComment++;
             } else if (in_array($stringTokens[$i]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens) === true
                 || in_array($stringTokens[$i]['code'], PHP_CodeSniffer_Tokens::$arithmeticTokens) === true
+                || $stringTokens[$i]['code'] === T_GOTO_LABEL
             ) {
                 // Commented out HTML/XML and other docs contain a lot of these
                 // characters, so it is best to not use them directly.

CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.inc

@@ -79,4 +79,5 @@ function myFunction()
 /*
     [^\'"]
 */
-?>
+
+// http://www.google.com

package.xml

@@ -31,6 +31,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Defined tokens for lower PHP versions are now phpcs-specific string instead of ints
     -- Stops conflict with other projects, like PHP_CodeCoverage
   - Added more guard code for syntax errors to various sniffs
+  - Squiz CommentedOutCodeSniff is now better at ignoring URLs inside comments
   - Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
   - Fixed bug #594 : Tokenizer issue on closure that returns by reference
  </notes>