bug: NoMultipleStatementsPerLineFixer must run before CurlyBracesPosi…

…tionFixer (#7087)

doc/list.rst

@@ -144,8 +144,8 @@ List of Available Rules
    The body of each structure MUST be enclosed by braces. Braces should be properly placed. Body of braces should be properly indented.
 
    *warning deprecated*   Use ``single_space_around_construct``, ``control_structure_braces``,
-   ``curly_braces_position``, ``control_structure_continuation_position``,
-   ``declare_parentheses``, ``no_multiple_statements_per_line``,
+   ``control_structure_continuation_position``, ``declare_parentheses``,
+   ``no_multiple_statements_per_line``, ``curly_braces_position``,
    ``statement_indentation`` and ``no_extra_blank_lines`` instead.
 
    Configuration options:

doc/rules/basic/braces.rst

@@ -12,8 +12,8 @@ This rule is deprecated and will be removed on next major version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``single_space_around_construct``, ``control_structure_braces``,
-``curly_braces_position``, ``control_structure_continuation_position``,
-``declare_parentheses``, ``no_multiple_statements_per_line``,
+``control_structure_continuation_position``, ``declare_parentheses``,
+``no_multiple_statements_per_line``, ``curly_braces_position``,
 ``statement_indentation`` and ``no_extra_blank_lines`` instead.
 
 Configuration

src/Fixer/Basic/CurlyBracesPositionFixer.php

@@ -145,11 +145,11 @@ public function isCandidate(Tokens $tokens): bool
      * {@inheritdoc}
      *
      * Must run before SingleLineEmptyBodyFixer, StatementIndentationFixer.
-     * Must run after ControlStructureBracesFixer.
+     * Must run after ControlStructureBracesFixer, NoMultipleStatementsPerLineFixer.
      */
     public function getPriority(): int
     {
-        return parent::getPriority();
+        return -2;
     }
 
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void

src/Fixer/Basic/NoMultipleStatementsPerLineFixer.php

@@ -41,6 +41,7 @@ public function getDefinition(): FixerDefinitionInterface
     /**
      * {@inheritdoc}
      *
+     * Must run before CurlyBracesPositionFixer.
      * Must run after ControlStructureBracesFixer, NoEmptyStatementFixer.
      */
     public function getPriority(): int

src/Fixer/Basic/SingleLineEmptyBodyFixer.php

@@ -42,7 +42,7 @@ public function getDefinition(): FixerDefinitionInterface
      */
     public function getPriority(): int
     {
-        return -1;
+        return -3;
     }
 
     public function isCandidate(Tokens $tokens): bool

tests/AutoReview/FixerFactoryTest.php

@@ -571,6 +571,9 @@ private static function getFixersPriorityGraph(): array
                 'binary_operator_spaces',
                 'method_argument_space',
             ],
+            'no_multiple_statements_per_line' => [
+                'curly_braces_position',
+            ],
             'no_php4_constructor' => [
                 'ordered_class_elements',
             ],

tests/Fixtures/Integration/priority/no_multiple_statements_per_line,curly_braces_position.test

@@ -0,0 +1,15 @@
+--TEST--
+Integration of fixers: no_multiple_statements_per_line,curly_braces_position.
+--RULESET--
+{"no_multiple_statements_per_line": true, "curly_braces_position": true}
+--EXPECT--
+<?php
+f(function () {
+static $x;
+if (true) {
+}
+});
+
+--INPUT--
+<?php
+f(function () { static $x; if (true) {} });