Merge branch '2.15' into 2.16

* 2.15:
  DX: add missing priority tests
  Remove useless priority comments
  Remove false test skip

Author: SpacePossum

src/Fixer/Import/NoLeadingImportSlashFixer.php

@@ -44,7 +44,6 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        // should be run after the SingleImportPerStatementFixer (for fix separated use statements as well) and NoUnusedImportsFixer (just for save performance)
         return -20;
     }
 

src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php

@@ -37,7 +37,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run before MultilineWhitespaceBeforeSemicolonsFixer, NoSpacesInsideParenthesisFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer.
+     * Must run before MultilineWhitespaceBeforeSemicolonsFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer, NoSpacesInsideParenthesisFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer.
      */
     public function getPriority()
     {

src/Fixer/Operator/StandardizeIncrementFixer.php

@@ -59,8 +59,6 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        // Must be run before IncrementStyleFixer in case user wants to
-        // post-increment instead
         return 1;
     }
 

src/Fixer/Phpdoc/PhpdocIndentFixer.php

@@ -53,14 +53,6 @@ class DocBlocks
      */
     public function getPriority()
     {
-        /*
-         * Should be run before all other docblock fixers apart from the
-         * phpdoc_to_comment fixer to make sure all fixers apply correct
-         * indentation to new code they add, and the phpdoc_params fixer only
-         * works on correctly indented docblocks. We also need to be running
-         * after the psr2 indentation fixer for obvious reasons.
-         * comments.
-         */
         return 20;
     }
 

src/Fixer/Phpdoc/PhpdocOrderFixer.php

@@ -65,11 +65,6 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        /*
-         * Should be run before the php_doc_separation fixer so that if we
-         * create incorrect annotation grouping while moving the annotations
-         * about, we're still ok.
-         */
         return -2;
     }
 

src/Fixer/Phpdoc/PhpdocTrimFixer.php

@@ -51,11 +51,6 @@ final class Foo {}
      */
     public function getPriority()
     {
-        /*
-         * Should be run after all phpdoc fixers that add or remove tags, or
-         * alter descriptions. This is so that they don't leave behind blank
-         * lines this fixer would have otherwise cleaned up.
-         */
         return -5;
     }
 

src/Fixer/Semicolon/NoSinglelineWhitespaceBeforeSemicolonsFixer.php

@@ -37,7 +37,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run after FunctionToConstantFixer, NoEmptyStatementFixer, SingleImportPerStatementFixer.
+     * Must run after CombineConsecutiveIssetsFixer, FunctionToConstantFixer, NoEmptyStatementFixer, SingleImportPerStatementFixer.
      */
     public function getPriority()
     {

tests/AutoReview/FixerFactoryTest.php

@@ -74,6 +74,7 @@ public function provideFixersPriorityCases()
             [$fixers['class_attributes_separation'], $fixers['indentation_type']],
             [$fixers['class_keyword_remove'], $fixers['no_unused_imports']],
             [$fixers['combine_consecutive_issets'], $fixers['multiline_whitespace_before_semicolons']],
+            [$fixers['combine_consecutive_issets'], $fixers['no_singleline_whitespace_before_semicolons']],
             [$fixers['combine_consecutive_issets'], $fixers['no_spaces_inside_parenthesis']],
             [$fixers['combine_consecutive_issets'], $fixers['no_trailing_whitespace']],
             [$fixers['combine_consecutive_issets'], $fixers['no_whitespace_in_blank_line']],
@@ -303,12 +304,8 @@ public function testFixersPriorityPairsHaveIntegrationTest(FixerInterface $first
         // It may only shrink, never add anything to it.
         $casesWithoutTests = [
             'indentation_type,phpdoc_indent.test',
-            'method_separation,braces.test',
             'phpdoc_no_access,phpdoc_order.test',
-            'phpdoc_no_access,phpdoc_separation.test',
             'phpdoc_no_package,phpdoc_order.test',
-            'phpdoc_order,phpdoc_separation.test',
-            'phpdoc_order,phpdoc_trim.test',
         ];
 
         $integrationTestName = $this->generateIntegrationTestName($first, $second);
@@ -416,12 +413,6 @@ public function testPriorityIntegrationTestFilesAreListedPriorityCases($fileName
             static::markTestIncomplete(sprintf('Case "%s" has unexpected name, please help fixing it.', $fileName));
         }
 
-        if (\in_array($fileName, [
-            'combine_consecutive_issets,no_singleline_whitespace_before_semicolons.test',
-        ], true)) {
-            static::markTestIncomplete(sprintf('Case "%s" is not fully handled, please help fixing it.', $fileName));
-        }
-
         static::assertSame(
             1,
             preg_match('#^([a-z][a-z0-9_]*),([a-z][a-z_]*)(?:_\d{1,3})?\.test(-(in|out)\.php)?$#', $fileName, $matches),

tests/Fixtures/Integration/priority/method_separation,braces.test

@@ -0,0 +1,27 @@
+--TEST--
+Integration of fixers: method_separation,braces.
+--RULESET--
+{"method_separation": true, "braces": true}
+--EXPECT--
+<?php
+
+class Foo
+{
+    /** bar */
+    public function bar()
+    {
+    }
+
+    /** baz */
+    public function baz()
+    {
+    }
+}
+
+--INPUT--
+<?php
+
+class Foo
+{
+    /** bar */public function bar() {}/** baz */public function baz() {}
+}

tests/Fixtures/Integration/priority/phpdoc_no_access,phpdoc_separation.test

@@ -0,0 +1,21 @@
+--TEST--
+Integration of fixers: phpdoc_no_access,phpdoc_separation.
+--RULESET--
+{"phpdoc_no_access": true, "phpdoc_separation": true}
+--EXPECT--
+<?php
+/**
+ * @param $foo
+ * @param $bar
+ *
+ * @return bool
+ */
+
+--INPUT--
+<?php
+/**
+ * @access public
+ * @param $foo
+ * @param $bar
+ * @return bool
+ */