Implement areFollowingArgumentsUsed

sirbrillig · Dec 21, 2018 · 067a149 · 067a149
1 parent 558343a
commit 067a149
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -3,6 +3,7 @@
 namespace VariableAnalysis\Lib;
 
 use PHP_CodeSniffer\Files\File;
+use VariableAnalysis\Lib\VariableInfo;
 
 class Helpers {
   public static function findContainingOpeningSquareBracket(File $phpcsFile, $stackPtr) {

diff --git a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -159,6 +159,23 @@ protected function getOrCreateVariableInfo($varName, $currScope) {
     return $scopeInfo->variables[$varName];
   }
 
+  protected function areFollowingArgumentsUsed($varInfo, $scopeInfo) {
+    $foundVarPosition = false;
+    foreach ($scopeInfo->variables as $variable) {
+      if ($variable === $varInfo) {
+        $foundVarPosition = true;
+        continue;
+      }
+      if (! $foundVarPosition) {
+        continue;
+      }
+      if ($variable->firstRead) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   protected function markVariableAssignment($varName, $stackPtr, $currScope) {
     $varInfo = $this->getOrCreateVariableInfo($varName, $currScope);
     if (!isset($varInfo->scopeType)) {
@@ -926,17 +943,20 @@ protected function processScopeClose(File $phpcsFile, $stackPtr) {
       return;
     }
     foreach ($scopeInfo->variables as $varInfo) {
-      $this->processScopeCloseForVariable($phpcsFile, $varInfo);
+      $this->processScopeCloseForVariable($phpcsFile, $varInfo, $scopeInfo);
     }
   }
 
-  protected function processScopeCloseForVariable($phpcsFile, $varInfo) {
+  protected function processScopeCloseForVariable($phpcsFile, $varInfo, $scopeInfo) {
     if ($varInfo->ignoreUnused || isset($varInfo->firstRead)) {
       return;
     }
     if ($this->allowUnusedFunctionParameters && $varInfo->scopeType === 'param') {
       return;
     }
+    if ($this->ignoreUnusedArgsBeforeUsed && $varInfo->scopeType === 'param' && $this->areFollowingArgumentsUsed($varInfo, $scopeInfo)) {
+      return;
+    }
     if ($varInfo->passByReference && isset($varInfo->firstInitialized)) {
       // If we're pass-by-reference then it's a common pattern to
       // use the variable to return data to the caller, so any