Merge branch 'feature/3422-squiz-scopeclosingbrace-bug-fix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php

@@ -65,11 +65,20 @@ public function process(File $phpcsFile, $stackPtr)
 
         // Check that the closing brace is on it's own line.
         $lastContent = $phpcsFile->findPrevious([T_INLINE_HTML, T_WHITESPACE, T_OPEN_TAG], ($scopeEnd - 1), $scopeStart, true);
-        if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
+        for ($lineStart = $scopeEnd; $tokens[$lineStart]['column'] > 1; $lineStart--);
+
+        if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']
+            || ($tokens[$lineStart]['code'] === T_INLINE_HTML
+            && trim($tokens[$lineStart]['content']) !== '')
+        ) {
             $error = 'Closing brace must be on a line by itself';
             $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'ContentBefore');
             if ($fix === true) {
-                $phpcsFile->fixer->addNewlineBefore($scopeEnd);
+                if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
+                    $phpcsFile->fixer->addNewlineBefore($scopeEnd);
+                } else {
+                    $phpcsFile->fixer->addNewlineBefore(($lineStart + 1));
+                }
             }
 
             return;

src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc

@@ -114,3 +114,9 @@ $match = match ($test) {
     1 => 'a',
     2 => 'b'
     };
+
+?>
+<?php if ($someConditional) : ?>
+<div class="container">
+
+</div> <?php endif; ?>

src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed

@@ -116,3 +116,10 @@ $match = match ($test) {
     1 => 'a',
     2 => 'b'
 };
+
+?>
+<?php if ($someConditional) : ?>
+<div class="container">
+
+</div> 
+<?php endif; ?>

src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php

@@ -33,6 +33,7 @@ public function getErrorList()
             102 => 1,
             111 => 1,
             116 => 1,
+            122 => 1,
         ];
 
     }//end getErrorList()