Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positi…

…ve when comparison inside closure
squizlabs · Nov 17, 2020 · 6f2a22d · 6f2a22d
1 parent 8421eeb
commit 6f2a22d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package.xml b/package.xml
@@ -63,6 +63,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Michael S for the patch
   - Fixed bug #2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
   - Fixed bug #3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
+  - Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
  </notes>
  <contents>
   <dir name="/">

diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
@@ -76,8 +76,9 @@ public function process(File $phpcsFile, $stackPtr)
         ];
 
         $next = $phpcsFile->findNext($ignore, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS
-            && $tokens[($next - 1)]['code'] === T_STRING
+        if ($tokens[$next]['code'] === T_CLOSURE
+            || ($tokens[$next]['code'] === T_OPEN_PARENTHESIS
+            && $tokens[($next - 1)]['code'] === T_STRING)
         ) {
             // Code will look like: $var = myFunction(
             // and will be ignored.

diff --git a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc
@@ -65,3 +65,9 @@ $a = [
 
 $var = $foo->something(!$var);
 $var = $foo?->something(!$var);
+
+$callback = function ($value) {
+    if ($value > 10) {
+        return false;
+    }
+};