Allow bare static property declaration

sirbrillig · Mar 25, 2019 · fa48318 · fa48318
1 parent f12701e
commit fa48318
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -359,7 +359,18 @@ protected function checkForClassProperty(File $phpcsFile, $stackPtr, $varName, $
     }
     $stopAtPtr = $staticPtr - 2;
     $visibilityPtr = $phpcsFile->findPrevious($propertyDeclarationKeywords, $staticPtr - 1, $stopAtPtr > 0 ? $stopAtPtr : 0);
-    return boolval($visibilityPtr);
+    if ($visibilityPtr) {
+      return true;
+    }
+    // it's legal to use `static` to define properties as well as to
+    // define variables, so make sure we are not in a function before
+    // assuming it's a property.
+    $tokens = $phpcsFile->getTokens();
+    $token  = $tokens[$stackPtr];
+    if ($token && !empty($token['conditions']) && end($token['conditions']) !== T_FUNCTION) {
+      return Helpers::areAnyConditionsAClass($token['conditions']);
+    }
+    return false;
   }
 
   protected function checkForCatchBlock(File $phpcsFile, $stackPtr, $varName, $currScope) {