Fixed bug #372 : phpcbf parse problem, wrong brace placement for inline IF

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php

@@ -131,11 +131,21 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $phpcsFile->fixer->addContent($closer, ' { ');
             }
 
-            $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($closer + 1));
-            $next      = $phpcsFile->findNext(T_WHITESPACE, ($closer + 1), ($semicolon + 1), true);
+            for ($end = ($closer + 1); $end < $phpcsFile->numTokens; $end++) {
+                if ($tokens[$end]['code'] === T_SEMICOLON) {
+                    break;
+                }
+
+                if (isset($tokens[$end]['scope_opener']) === true) {
+                    $end = $tokens[$end]['scope_closer'];
+                    break;
+                }
+            }
+
+            $next = $phpcsFile->findNext(T_WHITESPACE, ($closer + 1), ($end + 1), true);
 
             // Account for a comment on the end of the line.
-            for ($endLine = $semicolon; $endLine < $phpcsFile->numTokens; $endLine++) {
+            for ($endLine = $end; $endLine < $phpcsFile->numTokens; $endLine++) {
                 if (isset($tokens[($endLine + 1)]) === false
                     || $tokens[$endLine]['line'] !== $tokens[($endLine + 1)]['line']
                 ) {
@@ -144,22 +154,22 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             }
 
             if ($tokens[$endLine]['code'] !== T_COMMENT) {
-                $endLine = $semicolon;
+                $endLine = $end;
             }
 
-            if ($next !== $semicolon) {
-                if ($endLine !== $semicolon) {
+            if ($next !== $end) {
+                if ($endLine !== $end) {
                     $phpcsFile->fixer->addContent($endLine, '}');
                 } else {
-                    $phpcsFile->fixer->addContent($semicolon, ' }');
+                    $phpcsFile->fixer->addContent($end, ' }');
                 }
             } else {
-                if ($endLine !== $semicolon) {
-                    $phpcsFile->fixer->replaceToken($semicolon, '');
+                if ($endLine !== $end) {
+                    $phpcsFile->fixer->replaceToken($end, '');
                     $phpcsFile->fixer->addNewlineBefore($endLine);
                     $phpcsFile->fixer->addContent($endLine, '}');
                 } else {
-                    $phpcsFile->fixer->replaceToken($semicolon, '}');
+                    $phpcsFile->fixer->replaceToken($end, '}');
                 }
             }
 

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc

@@ -62,3 +62,13 @@ function test()
     if ($a)
         $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
 }
+
+if ($a)
+    foreach ($b as $c) {
+        if ($d) {
+            $e=$f;
+            $g=$h;
+        } elseif ($i==0) {
+            $j=$k;
+        }
+    }

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc.fixed

@@ -63,3 +63,13 @@ function test()
     if ($a) {
         $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : '')); }
 }
+
+if ($a) {
+    foreach ($b as $c) {
+        if ($d) {
+            $e=$f;
+            $g=$h;
+        } elseif ($i==0) {
+            $j=$k;
+        }
+    } }

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php

@@ -60,6 +60,7 @@ public function getErrorList($testFile='InlineControlStructureUnitTest.inc')
                     46 => 1,
                     49 => 1,
                     62 => 1,
+                    66 => 1,
                    );
             break;
         case 'InlineControlStructureUnitTest.js':

package.xml

@@ -61,6 +61,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #367 : Nested Anonymous Functions Causing False Negative
   - Fixed bug #371 : Shorthand binary cast causes tokenizer errors
     -- New token T_BINARY_CAST added for the b"string" cast format (the 'b' is the T_BINARY_CAST token)
+  - Fixed bug #372 : phpcbf parse problem, wrong brace placement for inline IF
   - Fixed bug #20196 : 1.5.2 breaks scope_closer position
  </notes>
  <contents>