Merge pull request #838 from PHPCSStandards/feature/squiz-embeddedphp-another-fixer-conflict

Squiz/EmbeddedPhp: bug fix - prevent fixer conflict

Author: jrfnl

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

@@ -292,8 +292,9 @@ private function validateMultilineEmbeddedPhp($phpcsFile, $stackPtr, $closingTag
         }
 
         // Check for a blank line at the bottom.
-        if ((isset($tokens[$lastContent]['scope_closer']) === false
-            || $tokens[$lastContent]['scope_closer'] !== $lastContent)
+        $lastNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closingTag - 1), ($stackPtr + 1), true);
+        if ((isset($tokens[$lastNonEmpty]['scope_closer']) === false
+            || $tokens[$lastNonEmpty]['scope_closer'] !== $lastNonEmpty)
             && $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
         ) {
             // Find a token on the blank line to throw the error on.

src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.1.inc

@@ -283,6 +283,13 @@ echo $j;
     echo $j;
     ?>
 
+<?php
+enum BlankLineBeforeCloseShouldBeIgnoredWhenLastBeforeIsCloseCurlyForScope
+{
+}//trailing comment
+
+?>
+
 <?php
 // This test case file MUST always end with an unclosed long open PHP tag (with this comment) to prevent
 // the tests running into the "last PHP closing tag excepted" condition breaking tests.

src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.1.inc.fixed

@@ -301,6 +301,13 @@ echo $j;
     echo $j;
     ?>
 
+<?php
+enum BlankLineBeforeCloseShouldBeIgnoredWhenLastBeforeIsCloseCurlyForScope
+{
+}//trailing comment
+
+?>
+
 <?php
 // This test case file MUST always end with an unclosed long open PHP tag (with this comment) to prevent
 // the tests running into the "last PHP closing tag excepted" condition breaking tests.