Merge branch 'feature/3.x-fixer-conflict-squiz-embeddedphp' of https:…

…//github.com/jrfnl/PHP_CodeSniffer
squizlabs · Jul 12, 2017 · ade7d4b · ade7d4b
2 parents 5fd3d10 + f1db2ba
commit ade7d4b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
@@ -370,6 +370,10 @@ private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr)
         $trailingSpace = 0;
         if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
             $trailingSpace = strlen($tokens[($closeTag - 1)]['content']);
+        } else if ($tokens[($closeTag - 1)]['code'] === T_COMMENT
+            && substr($tokens[($closeTag - 1)]['content'], -1) === ' '
+        ) {
+            $trailingSpace = (strlen($tokens[($closeTag - 1)]['content']) - strlen(rtrim($tokens[($closeTag - 1)]['content'])));
         }
 
         if ($trailingSpace !== 1) {
@@ -379,6 +383,8 @@ private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr)
             if ($fix === true) {
                 if ($trailingSpace === 0) {
                     $phpcsFile->fixer->addContentBefore($closeTag, ' ');
+                } else if ($tokens[($closeTag - 1)]['code'] === T_COMMENT) {
+                    $phpcsFile->fixer->replaceToken(($closeTag - 1), rtrim($tokens[($closeTag - 1)]['content']).' ');
                 } else {
                     $phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
                 }

diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc
@@ -107,3 +107,7 @@ function foo()
 
 <?php if ($foo) { ?>
 <?php } ?>
+
+<?php echo 'oops'; // Something. ?>
+<?php echo 'oops'; // Something.      ?>
+<?php echo 'oops'; // Something.?>
diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc.fixed b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc.fixed
@@ -107,3 +107,7 @@ function foo()
 
 <?php if ($foo) { ?>
 <?php } ?>
+
+<?php echo 'oops'; // Something. ?>
+<?php echo 'oops'; // Something. ?>
+<?php echo 'oops'; // Something. ?>
diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
@@ -51,6 +51,8 @@ public function getErrorList()
                 94  => 2,
                 100 => 1,
                 102 => 1,
+                112 => 1,
+                113 => 1,
                );
 
     }//end getErrorList()