Merge branch '2.12' into 2.14

* 2.12:
  Change BracesFixer to avoid indenting PHP inline brace before a closing tag, add test

Author: SpacePossum

src/Fixer/Basic/BracesFixer.php

@@ -342,6 +342,11 @@ static function ($item) {
                 continue;
             }
 
+            /* if CLOSE_TAG is after { on the same line, do not indent. e.g. <?php if ($condition) { ?> */
+            if ($tokens[$tokens->getNextNonWhitespace($startBraceIndex, " \t")]->isGivenKind(T_CLOSE_TAG)) {
+                continue;
+            }
+
             $endBraceIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $startBraceIndex);
 
             $indent = $this->detectIndent($tokens, $index);

tests/Fixer/Basic/BracesFixerTest.php

@@ -806,6 +806,14 @@ public function bar() {
     }
 }',
             ],
+            [
+                '<?php if ($condition) { ?>
+echo 1;
+<?php } else { ?>
+echo 2;
+<?php } ?>
+',
+            ],
         ];
     }