Merge pull request #16 from sirbrillig/fix/argument-assign-scope

Fix inline assign and access
sirbrillig · Dec 13, 2017 · 43713f0 · 43713f0
2 parents e666bc0 + 10c728b
commit 43713f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -566,26 +566,22 @@ protected function findWhereAssignExecuted(
     //  the closing bracket, if that's first.
     //  eg: echo (($var = 12) && ($var == 12));
     $semicolonPtr = $phpcsFile->findNext(T_SEMICOLON, $stackPtr + 1, null, false, null, true);
+    $commaPtr = $phpcsFile->findNext(T_COMMA, $stackPtr + 1, null, false, null, true);
     $closePtr = false;
     if (($openPtr = $this->findContainingBrackets($phpcsFile, $stackPtr)) !== false) {
       if (isset($tokens[$openPtr]['parenthesis_closer'])) {
         $closePtr = $tokens[$openPtr]['parenthesis_closer'];
       }
     }
 
-    if ($semicolonPtr === false) {
-      if ($closePtr === false) {
-        // TODO: panic
-        return $stackPtr;
-      }
-      return $closePtr;
-    }
-
-    if ($closePtr < $semicolonPtr) {
-      return $closePtr;
+    // Return the first thing: comma, semicolon, close-bracket, or stackPtr if nothing else
+    $assignEndTokens = [$commaPtr, $semicolonPtr, $closePtr];
+    $assignEndTokens = array_filter($assignEndTokens); // remove false values
+    sort($assignEndTokens);
+    if (empty($assignEndTokens)) {
+      return $stackPtr;
     }
-
-    return $semicolonPtr;
+    return $assignEndTokens[0];
   }
 
   protected function findContainingBrackets(

diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithInlineAssignFixture.php b/VariableAnalysis/Tests/CodeAnalysis/fixtures/FunctionWithInlineAssignFixture.php
@@ -9,3 +9,10 @@ function function_with_inline_assigns() {
     }
     echo $var2;
 }
+
+function function_with_assigns_and_usage() {
+    doSomething(
+        $foo = 'bar',
+        $foo
+    );
+}