Changelog + anon test case for #2018

package.xml

@@ -221,6 +221,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- The error message format for the SpacingAfterOpen and SpacingBeforeClose messages has been changed
        --- These used to contain 3 pieces of data, but now only contain 2
     -- If you have customised the error messages of this sniff, please review your ruleset after upgrading
+  - Fixed bug #2018 : Generic.Formatting.MultipleStatementAlignment does see PHP close tag as end of statement block
+    -- Thanks to Juliette Reinders Folmer for the patch
  </notes>
  <contents>
   <dir name="/">

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

@@ -374,16 +374,16 @@ $abc = 'something';
 if ($foo) {}
 $defghi = 'longer something';
 
-		public function get_location_details( $location_id, $atts ) {
-			$coords_lat  = 'abc';
-			$coords_long = 'def';
-			?>
-
-			<div>
-				<?php
-				$location       = 'ghi';
-				$other_location = 'jkl';
-				?>
-			</div>
-			<?php
-		}
+function foo() {
+    $foo = 'foo';
+    $bar = 'bar';
+    ?>
+
+    <div>
+        <?php
+        $foo = 'foo';
+        $bar = 'bar';
+        ?>
+    </div>
+    <?php
+}

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

@@ -374,16 +374,16 @@ $abc = 'something';
 if ($foo) {}
 $defghi = 'longer something';
 
-		public function get_location_details( $location_id, $atts ) {
-			$coords_lat  = 'abc';
-			$coords_long = 'def';
-			?>
-
-			<div>
-				<?php
-				$location       = 'ghi';
-				$other_location = 'jkl';
-				?>
-			</div>
-			<?php
-		}
+function foo() {
+    $foo = 'foo';
+    $bar = 'bar';
+    ?>
+
+    <div>
+        <?php
+        $foo = 'foo';
+        $bar = 'bar';
+        ?>
+    </div>
+    <?php
+}