bug #1840 [Bug] BracesFixer - Do add a line before close tag (SpacePo…

…ssum) This PR was submitted for the 1.12 branch but it was merged into the 1.11 branch instead (closes #1840). Discussion ---------- [Bug] BracesFixer - Do add a line before close tag Test for #1829 Commits ------- 9578a00 Handle close tag.
PHP-CS-Fixer · Jun 15, 2016 · 521f522 · 521f522
2 parents 361c891 + 9578a00
commit 521f522
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Symfony/CS/Fixer/PSR2/BracesFixer.php b/Symfony/CS/Fixer/PSR2/BracesFixer.php
@@ -215,7 +215,7 @@ function ($item) {
                         // and it is not a `${"a"}->...` and `${"b{$foo}"}->...` situation
                         !($nestToken->equals('}') && $tokens[$nestIndex - 1]->equalsAny(array('"', "'", array(T_CONSTANT_ENCAPSED_STRING))))
                     ) {
-                        if ($nextNonWhitespaceNestToken->isGivenKind($this->getControlContinuationTokens())) {
+                        if ($nextNonWhitespaceNestToken->isGivenKind($this->getControlContinuationTokens()) || $nextNonWhitespaceNestToken->isGivenKind(T_CLOSE_TAG)) {
                             $whitespace = ' ';
                         } else {
                             $nextToken = $tokens[$nestIndex + 1];

diff --git a/Symfony/CS/Tests/Fixer/PSR2/BracesFixerTest.php b/Symfony/CS/Tests/Fixer/PSR2/BracesFixerTest.php
@@ -31,6 +31,20 @@ public function provideFixControlContinuationBracesCases()
         return array(
             array(
                 '<?php
+class Foo
+{
+    public function A()
+    {
+        ?>
+        Test<?php echo $foobar; ?>Test
+        <?php
+        $a = 1;
+    }
+}
+',
+            ),
+            array(
+                '<?php
     if (true) {
         $a = 1;
     } else {