Merge branch 'feature/2787-squiz-disallowmultipleassignments-bugfix' of

https://github.com/jrfnl/PHP_CodeSniffer

src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php

@@ -64,6 +64,16 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
+        // Ignore member var definitions.
+        if (empty($tokens[$stackPtr]['conditions']) === false) {
+            $conditions = $tokens[$stackPtr]['conditions'];
+            end($conditions);
+            $deepestScope = key($conditions);
+            if (isset(Tokens::$ooScopeTokens[$tokens[$deepestScope]['code']]) === true) {
+                return;
+            }
+        }
+
         /*
             The general rule is:
             Find an equal sign and go backwards along the line. If you hit an
@@ -124,14 +134,6 @@ public function process(File $phpcsFile, $stackPtr)
             $varToken = $start;
         }
 
-        // Ignore member var definitions.
-        if (isset(Tokens::$scopeModifiers[$tokens[$varToken]['code']]) === true
-            || $tokens[$varToken]['code'] === T_VAR
-            || $tokens[$varToken]['code'] === T_STATIC
-        ) {
-            return;
-        }
-
         // Ignore the first part of FOR loops as we are allowed to
         // assign variables there even though the variable is not the
         // first thing on the line.

src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc

@@ -62,3 +62,16 @@ $closureWithDefaultParamter = function(array $testArray=array()) {};
 while ( ( $csvdata = fgetcsv( $handle, 2000, $separator ) ) !== false ) {
 	// Do something.
 }
+
+// Issue #2787.
+class Foo {
+    protected ?int $id = null;
+}
+
+class Bar
+{
+    // Multi-property assignments.
+    private $a = false, $b = true; // Non-typed.
+    public bool $c = false, $d = true;
+    protected int $e = 123, $f = 987;
+}