Lines without assignments were causing problems when in the middle of…

… assignment blocks
squizlabs · Jan 20, 2014 · 579d39c · 579d39c
1 parent 0f7d9dc
commit 579d39c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
@@ -118,6 +118,7 @@ public function checkAlignment(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $maxPadding  = null;
         $stopped     = null;
         $lastCode    = $stackPtr;
+        $lastSemi    = null;
 
         $find = array_diff(PHP_CodeSniffer_Tokens::$assignmentTokens, array(T_DOUBLE_ARROW));
         for ($assign = $stackPtr; $assign < $phpcsFile->numTokens; $assign++) {
@@ -129,10 +130,24 @@ public function checkAlignment(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
 
                     $lastCode = $assign;
-                }
+
+                    if ($tokens[$assign]['code'] === T_SEMICOLON) {
+                        if ($tokens[$assign]['conditions'] === $tokens[$stackPtr]['conditions']) {
+                            if ($lastSemi !== null && $prevAssign !== null && $lastSemi > $prevAssign) {
+                                // This statement did not have an assignment operator in it.
+                                break;
+                            } else {
+                                $lastSemi = $assign;
+                            }
+                        } else {
+                            // Statement is in a different context, so the block is over.
+                            break;
+                        }
+                    }
+                }//end if
 
                 continue;
-            }
+            }//end if
 
             if ($assign !== $stackPtr) {
                 // Has to be nested inside the same conditions as the first assignment.

diff --git a/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc b/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
@@ -216,3 +216,8 @@ $varonetwothree     = 'three';
 $varonetwothreefour = 'four';
 
 // @codingStandardsChangeSetting Generic.Formatting.MultipleStatementAlignment maxPadding 1000
+
+$filterQuery = SquizRoadmap::getSearchQueryFilter($searchParams);
+Channels::addToBasket('itemid', $filterQuery);
+$query   = DAL::getDALQuery('SquizRoadmapItem', 'getItemIds');
+$results = DAL::getAssoc($query, 0);