Squiz.PHP.DisallowMultipleAssignmentsSniff: Fixed false positive when…

… assigment is on first line in closure
squizlabs · Apr 8, 2021 · c19a0f5 · c19a0f5
1 parent 9ca9a54
commit c19a0f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
@@ -83,6 +83,12 @@ public function process(File $phpcsFile, $stackPtr)
         */
 
         for ($varToken = ($stackPtr - 1); $varToken >= 0; $varToken--) {
+            if (in_array($tokens[$varToken]['code'], [T_SEMICOLON, T_OPEN_CURLY_BRACKET], true) === true) {
+                // We've reached the next statement, so we
+                // didn't find a variable.
+                return;
+            }
+
             // Skip brackets.
             if (isset($tokens[$varToken]['parenthesis_opener']) === true && $tokens[$varToken]['parenthesis_opener'] < $varToken) {
                 $varToken = $tokens[$varToken]['parenthesis_opener'];
@@ -94,12 +100,6 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }
 
-            if ($tokens[$varToken]['code'] === T_SEMICOLON) {
-                // We've reached the next statement, so we
-                // didn't find a variable.
-                return;
-            }
-
             if ($tokens[$varToken]['code'] === T_VARIABLE) {
                 // We found our variable.
                 break;

diff --git a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc
@@ -89,3 +89,12 @@ $array = [
 ];
 
 $arrow_function = fn ($a = null) => $a;
+
+function ($html) {
+    $regEx = '/regexp/';
+
+    return preg_replace_callback($regEx, function ($matches) {
+        [$all] = $matches;
+        return $all;
+    }, $html);
+};