Merge branch 'feature/2565-generic-inlinecontrolstructure-bugfix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

package.xml

@@ -505,6 +505,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.4.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.5.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.6.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.7.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineControlStructureUnitTest.php" role="test" />

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

@@ -140,6 +140,16 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        if ($tokens[$nextNonEmpty]['code'] === T_COLON) {
+            var_dump($tokens[$nextNonEmpty]);
+            // Alternative control structure.
+            // T_END... missing. Either live coding, parse error or end
+            // tag in short open tags and scan run with short_open_tag=Off.
+            // Bow out completely as any further detection will be unreliable
+            // and create incorrect fixes or cause fixer conflicts.
+            return ($phpcsFile->numTokens + 1);
+        }
+
         unset($nextNonEmpty, $start);
 
         // This is a control structure without an opening brace,

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.7.inc

@@ -0,0 +1,16 @@
+<?php
+// Issue #2565.
+// Important note: this file intentionally does not have a ".fixed" version as
+// when `short_open_tag=Off`, no fixes will be made, while when `short_open_tag=On`
+// no fixes are necessary.
+?>
+
+<?php if (true) : ?>
+<? endif ?>
+<?php if (true) { ?>
+<? } ?>
+
+<? if (false) : ?>
+<? endif ?>
+<?php if (false) { ?>
+<?php } ?>