Fixed bug #564 : Generic MultipleStatementAlignment sniff reports incorrect errors for multiple assignments on a single line

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php

@@ -150,6 +150,10 @@ public function checkAlignment(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
                 }//end if
 
+                continue;
+            } else if ($assign !== $stackPtr && $tokens[$assign]['line'] === $lastLine) {
+                // Skip multiple assignments on the same line. We only need to
+                // try and align the first assignment.
                 continue;
             }//end if
 

CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc

@@ -227,3 +227,8 @@ $path .= FileSystem::getHashDir($itemid).'/'.$itemid;
 
 $contents  .= 'if (';
 $conditions = array();
+
+$bar = 'hi';
+$foo = $moo = $test;
+$boo = 'boo';
+$foo = $moooo = 'foo';

CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc.fixed

@@ -227,3 +227,8 @@ $path .= FileSystem::getHashDir($itemid).'/'.$itemid;
 
 $contents  .= 'if (';
 $conditions = array();
+
+$bar = 'hi';
+$foo = $moo = $test;
+$boo = 'boo';
+$foo = $moooo = 'foo';

package.xml

@@ -50,6 +50,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
   - Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis
   - Fixed bug #558 : PHPCBF adds brace for ELSE IF split over multiple lines
+  - Fixed bug #564 : Generic MultipleStatementAlignment sniff reports incorrect errors for multiple assignments on a single line
  </notes>
  <contents>
   <dir name="/">