Merge pull request #929 from PHPCSStandards/feature/generic-forbiddenfunctions-improve-comment-tolerance

Generic/ForbiddenFunctions: improve comment tolerance

Author: jrfnl

src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php

@@ -14,6 +14,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 class ForbiddenFunctionsSniff implements Sniff
 {
@@ -135,12 +136,12 @@ public function process(File $phpcsFile, $stackPtr)
             T_IMPLEMENTS               => true,
         ];
 
-        $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
 
         // If function call is directly preceded by a NS_SEPARATOR it points to the
         // global namespace, so we should still catch it.
         if ($tokens[$prevToken]['code'] === T_NS_SEPARATOR) {
-            $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($prevToken - 1), null, true);
+            $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true);
             if ($tokens[$prevToken]['code'] === T_STRING) {
                 // Not in the global namespace.
                 return;
@@ -152,7 +153,7 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if (isset($ignore[$tokens[$nextToken]['code']]) === true) {
             // Not a call to a PHP function.
             return;

src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc

@@ -48,7 +48,7 @@ class RightSideVisTest {
 }
 
 namespace Something\sizeof;
-$var = new Sizeof();
+$var = new   /*comment*/   Sizeof();
 class SizeOf implements Something {}
 
 function mymodule_form_callback(SizeOf $sizeof) {
@@ -58,3 +58,5 @@ $size = $class?->sizeof($array);
 
 #[SizeOf(10)]
 function doSomething() {}
+
+$size = sizeof /*comment*/ ($array);

src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php

@@ -31,9 +31,10 @@ final class ForbiddenFunctionsUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         $errors = [
-            2 => 1,
-            4 => 1,
-            6 => 1,
+            2  => 1,
+            4  => 1,
+            6  => 1,
+            62 => 1,
         ];
 
         return $errors;