Fixed bug #1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML

Author: gsherwood

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

@@ -166,7 +166,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
             }
         } else {
-            $expectedIndent = ($startColumn - 1);
+            $expectedIndent = max(0, ($startColumn - 1));
             if ($braceIndent !== $expectedIndent) {
                 $error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
                 $data  = array(

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

@@ -140,3 +140,7 @@ switch ( $a ) {
         }
     return 5;
 }
+
+?>
+<?php $_cartQty = $this->getSummaryCount(); ?>
+<div id="minicart" <?php if ($_cartQty == 0): ?>class="empty"<?php endif; ?>>

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

@@ -143,3 +143,8 @@ switch ( $a ) {
         }
         return 5;
 }
+
+?>
+<?php $_cartQty = $this->getSummaryCount(); ?>
+<div id="minicart" <?php if ($_cartQty == 0): ?>class="empty"<?php 
+endif; ?>>

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

@@ -56,6 +56,7 @@ public function getErrorList()
                 127 => 1,
                 135 => 1,
                 141 => 1,
+                146 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -49,6 +49,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz.WhiteSpace.OperatorSpacing no longer checks the equal sign in declare statements
     -- Thanks to Juliette Reinders Folmer for the patch
   - Added missing error codes for a couple of sniffs so they can now be customised as normal
+  - Fixed bug #1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML
   - Fixed bug #1364 : Yield From values are not recognised as returned values in Squiz FunctionComment sniff
   - Fixed bug #1373 : Error in tab expansion results in white-space of incorrect size
     -- Thanks to Mark Clements for the patch