Fix a year's worth of conflicts

src/AbstractNoUselessElseFixer.php

@@ -25,7 +25,7 @@ abstract class AbstractNoUselessElseFixer extends AbstractFixer
     public function getPriority()
     {
         // should be run before NoWhitespaceInBlankLineFixer, NoExtraBlankLinesFixer, BracesFixer and after NoEmptyStatementFixer.
-        return 34;
+        return 35;
     }
 
     /**

src/Fixer/Basic/BracesFixer.php

@@ -126,8 +126,9 @@ public function bar($baz)
      */
     public function getPriority()
     {
-        // should be run after the ElseIfFixer, LineEndingFixer, NoEmptyStatementFixer and NoUselessElseFixer
-        return 33;
+        // should be run after ElseIfFixer, LineEndingFixer, NoEmptyStatementFixer, NoUselessElseFixer, SingleTraitInsertPerStatementFixer
+        // should be run before MethodChainingIndentationFixer
+        return 34;
     }
 
     /**

src/Fixer/ClassNotation/SingleTraitInsertPerStatementFixer.php

@@ -43,8 +43,8 @@ final class Example
 
     public function getPriority()
     {
-        // must be run before Braces and SpaceAfterSemicolonFixer
-        return 1;
+        // should be run before Braces, SpaceAfterSemicolonFixer
+        return 35;
     }
 
     public function isCandidate(Tokens $tokens)

src/Fixer/ControlStructure/ElseifFixer.php

@@ -43,7 +43,7 @@ public function getPriority()
     {
         // Should run after NoAlternativeSyntaxFixer
         // Should run before BracesFixer
-        return 34;
+        return 35;
     }
 
     /**

src/Fixer/ControlStructure/NoAlternativeSyntaxFixer.php

@@ -68,7 +68,7 @@ public function isCandidate(Tokens $tokens)
     public function getPriority()
     {
         // Should run before BracesFixer and ElseifFixer
-        return 35;
+        return 36;
     }
 
     /**

src/Fixer/ControlStructure/NoUnneededCurlyBracesFixer.php

@@ -52,7 +52,7 @@ public function getDefinition()
     public function getPriority()
     {
         // must be run before NoUselessElseFixer and NoUselessReturnFixer.
-        return 35;
+        return 36;
     }
 
     /**

src/Fixer/Semicolon/NoEmptyStatementFixer.php

@@ -42,7 +42,7 @@ public function getPriority()
     {
         // should be run before the BracesFixer, CombineConsecutiveUnsetsFixer, NoExtraBlankLinesFixer, MultilineWhitespaceBeforeSemicolonsFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer,
         // NoTrailingCommaInListCallFixer, NoUselessReturnFixer, NoWhitespaceInBlankLineFixer, SpaceAfterSemicolonFixer, SwitchCaseSemicolonToColonFixer.
-        return 35;
+        return 36;
     }
 
     /**

src/Fixer/Semicolon/SpaceAfterSemicolonFixer.php

@@ -54,7 +54,8 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        return -1; // Must run after MultilineWhitespaceBeforeSemicolonsFixer
+        // should be run after MultilineWhitespaceBeforeSemicolonsFixer, SingleTraitInsertPerStatementFixer
+        return -1;
     }
 
     /**

src/Fixer/Whitespace/LineEndingFixer.php

@@ -55,7 +55,7 @@ public function getDefinition()
     public function getPriority()
     {
         // Should run before BracesFixer
-        return 34;
+        return 35;
     }
 
     /**

src/Fixer/Whitespace/MethodChainingIndentationFixer.php

@@ -44,7 +44,7 @@ public function getPriority()
     {
         // Should run after BracesFixer
         // Should run before ArrayIndentationFixer
-        return -29;
+        return 33;
     }
 
     /**