Merge pull request #209 from magento-commerce/imported-fredden-magento-coding-standard-438

[Imported] Auto-fix `Magento2.PHP.ShortEchoSyntax.ShortEchoTag`

Author: sidolov

Magento2/Sniffs/PHP/ShortEchoSyntaxSniff.php

@@ -37,11 +37,30 @@ public function process(File $phpcsFile, $stackPtr)
 
         $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($tokens[$nextToken]['code'] == T_ECHO) {
-            $phpcsFile->addWarning(
+            $fix = $phpcsFile->addFixableWarning(
                 'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
                 $stackPtr,
                 'ShortEchoTag'
             );
+
+            if ($fix) {
+                $phpcsFile->fixer->beginChangeset();
+
+                if (($nextToken - $stackPtr) === 1) {
+                    $phpcsFile->fixer->replaceToken($stackPtr, '<?=');
+                } else {
+                    $phpcsFile->fixer->replaceToken($stackPtr, '<?= ');
+                }
+
+                for ($i = $stackPtr + 1; $i < $nextToken; $i++) {
+                    if ($tokens[$i]['code'] === T_WHITESPACE) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+                }
+
+                $phpcsFile->fixer->replaceToken($nextToken, '');
+                $phpcsFile->fixer->endChangeset();
+            }
         }
     }
 }

Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc

@@ -3,3 +3,5 @@
 <?php $foo = bar; ?>
 
 <?php echo "foo" ?>
+
+<?php /* @noEscape */ echo 'baz'; ?>

Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.inc.fixed

@@ -0,0 +1,7 @@
+<?= "foo" ?>
+
+<?php $foo = bar; ?>
+
+<?= "foo" ?>
+
+<?= /* @noEscape */ 'baz'; ?>

Magento2/Tests/PHP/ShortEchoSyntaxUnitTest.php

@@ -24,6 +24,7 @@ public function getWarningList()
     {
         return [
             5 => 1,
+            7 => 1,
         ];
     }
 }