Fixed bug #790 : Incorrect missing @throws error in methods that use closures

Author: gsherwood

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

@@ -84,17 +84,16 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
             return;
         }
 
-        // Find the position where the current function scope ends.
-        $currScopeEnd = 0;
-        if (isset($tokens[$currScope]['scope_closer']) === true) {
-            $currScopeEnd = $tokens[$currScope]['scope_closer'];
-        }
+        $currScopeEnd = $tokens[$currScope]['scope_closer'];
 
         // Find all the exception type token within the current scope.
         $throwTokens = array();
         $currPos     = $stackPtr;
-        if ($currScopeEnd !== 0) {
-            while ($currPos < $currScopeEnd && $currPos !== false) {
+        $foundThrows = false;
+        while ($currPos < $currScopeEnd && $currPos !== false) {
+            if ($phpcsFile->hasCondition($currPos, T_CLOSURE) === false) {
+                $foundThrows = true;
+
                 /*
                     If we can't find a NEW, we are probably throwing
                     a variable, so we ignore it, but they still need to
@@ -136,10 +135,14 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
                         }
                     }//end if
                 }//end if
+            }//end if
+
+            $currPos = $phpcsFile->findNext(T_THROW, ($currPos + 1), $currScopeEnd);
+        }//end while
 
-                $currPos = $phpcsFile->findNext(T_THROW, ($currPos + 1), $currScopeEnd);
-            }//end while
-        }//end if
+        if ($foundThrows === false) {
+            return;
+        }
 
         // Only need one @throws tag for each type of exception thrown.
         $throwTokens = array_unique($throwTokens);

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

@@ -275,4 +275,14 @@ class Test
     protected function foo()
     {
     }
+
+    /**
+     * @return Closure
+     */
+    public function getStuff()
+    {
+        return function () {
+            throw new RuntimeException("bam!");
+        };
+    }
 }

package.xml

@@ -39,6 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Version control reports now show which errors are fixable if you are showing sources
   - Added a new sniff to enforce a single space after a NOT operator (request #1051)
     -- Include in a ruleset using the code Generic.Formatting.SpaceAfterNot
+  - Fixed bug #790 : Incorrect missing @throws error in methods that use closures
   - Fixed bug #908 : PSR2 standard is not checking that closing brace is on line following the body
   - Fixed bug #945 : Incorrect indent behavior using deep-nested function and arrays
   - Fixed bug #961 : Two anonymous functions passed as function/method arguments cause indentation false positive