Avoid creating invalid open tags when replacing short open tags

Author: ghunti

CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php

@@ -72,7 +72,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             $data  = array($token['content']);
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Found', $data);
             if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($stackPtr, '<?php');
+                $correctOpening = '<?php';
+                if (isset($tokens[$stackPtr + 1]) && $tokens[$stackPtr + 1]['code'] !== T_WHITESPACE) {
+                    // Avoid creation of invalid open tags like <?phpecho if the original was <?echo
+                    $correctOpening .= ' ';
+                }
+                $phpcsFile->fixer->replaceToken($stackPtr, $correctOpening);
             }
 
             $phpcsFile->recordMetric($stackPtr, 'PHP short open tag used', 'yes');

CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.2.inc

@@ -4,4 +4,5 @@ Some content <? echo $var ?> Some more content
 <?
 echo $var;
 ?>
+<?echo $var; ?>
 </div>

CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.2.inc.fixed

@@ -4,4 +4,5 @@ Some content <?php echo $var ?> Some more content
 <?php
 echo $var;
 ?>
+<?php echo $var; ?>
 </div>

CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php

@@ -92,6 +92,7 @@ public function getErrorList($testFile='')
                     2 => 1,
                     3 => 1,
                     4 => 1,
+                    7 => 1
                    );
         default:
             return array();