Squiz FunctionCommentThrowTagSniff now ignores non-docblock comments

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php

@@ -73,14 +73,8 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
 
         $commentEnd = $phpcsFile->findPrevious($find, ($currScope - 1), null, true);
         if ($tokens[$commentEnd]['code'] === T_COMMENT) {
-            // Inline comments might just be closing comments for
-            // control structures or functions instead of function comments
-            // using the wrong comment type. If there is other code on the line,
-            // assume they relate to that code.
-            $prev = $phpcsFile->findPrevious($find, ($commentEnd - 1), null, true);
-            if ($prev !== false && $tokens[$prev]['line'] === $tokens[$commentEnd]['line']) {
-                $commentEnd = $prev;
-            }
+            // Function is using the wrong type of comment.
+            return;
         }
 
         if ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG

CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.inc

@@ -268,4 +268,11 @@ class Test
             throw new \RuntimeException('The $this->folderName must be specified before proceeding.');
         }
     }
+
+    /*
+     *
+     */
+    protected function foo()
+    {
+    }
 }

package.xml

@@ -49,6 +49,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Renamed Squiz.CSS.Opacity.SpacingAfterPoint to Squiz.CSS.Opacity.DecimalPrecision
     -- Please update your ruleset if you are referencing this error code directly
   - Squiz CSS IndentationSniff no longer assumes the class opening brace is at the end of a line
+  - Squiz FunctionCommentThrowTagSniff now ignores non-docblock comments
   - Fixed bug #872 : Incorrect detection of blank lines between CSS class names
  </notes>
  <contents>