Merge pull request #423 from PHPCSStandards/feature/pear-scopeclosingbrace-fix-fixer-conflict

PEAR/ScopeClosingBrace: prevent fixer conflict with itself

Author: jrfnl

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

@@ -93,16 +93,19 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         // Check that the closing brace is on it's own line.
-        $lastContent = $phpcsFile->findPrevious(
-            [
-                T_WHITESPACE,
-                T_INLINE_HTML,
-                T_OPEN_TAG,
-            ],
-            ($scopeEnd - 1),
-            $scopeStart,
-            true
-        );
+        for ($lastContent = ($scopeEnd - 1); $lastContent > $scopeStart; $lastContent--) {
+            if ($tokens[$lastContent]['code'] === T_WHITESPACE || $tokens[$lastContent]['code'] === T_OPEN_TAG) {
+                continue;
+            }
+
+            if ($tokens[$lastContent]['code'] === T_INLINE_HTML
+                && ltrim($tokens[$lastContent]['content']) === ''
+            ) {
+                continue;
+            }
+
+            break;
+        }
 
         if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
             $error = 'Closing brace must be on a line by itself';

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

@@ -162,3 +162,9 @@ enum Suits {}
 enum Cards
 {
     }
+
+?>
+<!-- Prevent fixer conflict with itself when the scope closer is preceded by non-empty/non-indentation inline HTML. -->
+<?php if ($someConditional) : ?>
+<div class="container">
+</div> <?php endif;

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

@@ -168,3 +168,10 @@ enum Suits {
 enum Cards
 {
 }
+
+?>
+<!-- Prevent fixer conflict with itself when the scope closer is preceded by non-empty/non-indentation inline HTML. -->
+<?php if ($someConditional) : ?>
+<div class="container">
+</div> <?php 
+endif;

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

@@ -49,6 +49,7 @@ public function getErrorList()
             154 => 1,
             160 => 1,
             164 => 1,
+            170 => 1,
         ];
 
     }//end getErrorList()