VariableAnalysisSniff::checkForStaticOutsideClass(): fix comment tolerance (#150)

PHP ignores comments in unexpected/unconventional places and so should the sniff.

Includes adjusting an existing unit test.

Without the fix, the adjusted unit test would cause test failures.

Author: jrfnl

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

@@ -706,11 +706,14 @@ protected function checkForStaticOutsideClass(File $phpcsFile, $stackPtr, $varNa
     $tokens = $phpcsFile->getTokens();
     $token  = $tokens[$stackPtr];
 
-    $doubleColonPtr = $stackPtr - 1;
-    if ($tokens[$doubleColonPtr]['code'] !== T_DOUBLE_COLON) {
+    $doubleColonPtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
+    if ($doubleColonPtr === false || $tokens[$doubleColonPtr]['code'] !== T_DOUBLE_COLON) {
+      return false;
+    }
+    $classNamePtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $doubleColonPtr - 1, null, true);
+    if ($classNamePtr === false) {
       return false;
     }
-    $classNamePtr = $stackPtr - 2;
     $code = $tokens[$classNamePtr]['code'];
     $staticReferences = [
       T_SELF,

VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithClosureFixture.php

@@ -55,7 +55,7 @@ function method_with_self_inside_closure() {
 
 function function_with_self_in_closure() {
     return function() {
-        return self::$foobar; // should be an error
+        return self /*comment*/::$foobar; // should be an error
     };
 }
 
@@ -67,7 +67,7 @@ function function_with_this_in_closure() {
 
 function function_with_static_in_closure() {
     return function() {
-        return static::$foobar; // should be an error
+        return static:: /*comment*/ $foobar; // should be an error
     };
 }