rename

README.rst

@@ -504,7 +504,7 @@ Choose from the list of available fixers:
                          MUST NOT be a whitespace
                          before each comma.
 
-* **no_whitespace_in_blank_lines** [@Symfony]
+* **no_whitespace_in_blank_line** [@Symfony]
                          Remove trailing whitespace at
                          the end of blank lines.
 

UPGRADE.md

@@ -127,7 +127,7 @@ unary_operators_spaces                         | unary_operator_spaces
 unneeded_control_parentheses                   | no_unneeded_control_parentheses
 unused_use                                     | no_unused_imports
 visibility                                     | visibility_required
-whitespacy_lines                               | no_whitespace_in_blank_lines
+whitespacy_lines                               | no_whitespace_in_blank_line
 
 Changes to Fixers
 -----------------

src/Fixer/ControlStructure/NoUselessElseFixer.php

@@ -67,7 +67,7 @@ final class NoUselessElseFixer extends AbstractFixer
      */
     public function getPriority()
     {
-        // should be run before NoDuplicateSemicolonsFixer, NoWhitespaceInBlankLinesFixer, NoExtraConsecutiveBlankLinesFixer and BracesFixer.
+        // should be run before NoDuplicateSemicolonsFixer, NoWhitespaceInBlankLineFixer, NoExtraConsecutiveBlankLinesFixer and BracesFixer.
         return 25;
     }
 

src/Fixer/Phpdoc/NoEmptyPhpdocFixer.php

@@ -57,7 +57,7 @@ final class NoEmptyPhpdocFixer extends AbstractFixer
      */
     public function getPriority()
     {
-        // should be run before NoExtraConsecutiveBlankLinesFixer, NoTrailingSpacesFixer, NoWhitespaceInBlankLinesFixer and
+        // should be run before NoExtraConsecutiveBlankLinesFixer, NoTrailingSpacesFixer, NoWhitespaceInBlankLineFixer and
         // after PhpdocNoAccessFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer.
         return 5;
     }

src/Fixer/ReturnNotation/NoUselessReturnFixer.php

@@ -58,7 +58,7 @@ final class NoUselessReturnFixer extends AbstractFixer
      */
     public function getPriority()
     {
-        // should be run before BlankLineBeforeReturnFixer, NoExtraConsecutiveBlankLinesFixer, NoWhitespaceInBlankLinesFixer and after SimplifiedNullReturnFixer and NoDuplicateSemicolonFixer.
+        // should be run before BlankLineBeforeReturnFixer, NoExtraConsecutiveBlankLinesFixer, NoWhitespaceInBlankLineFixer and after SimplifiedNullReturnFixer and NoDuplicateSemicolonFixer.
         return -18;
     }
 

src/Fixer/Semicolon/NoEmptyStatementFixer.php

@@ -75,7 +75,7 @@ final class NoEmptyStatementFixer extends AbstractFixer
     public function getPriority()
     {
         // should be run before the BracesFixer, CombineConsecutiveUnsetsFixer, NoExtraConsecutiveBlankLinesFixer, NoMultilineWhitespaceBeforeSemicolonsFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer,
-        // NoTrailingCommaInListCallFixer, NoUselessReturnFixer, NoWhitespaceInBlankLinesFixer, SpaceAfterSemicolonFixer, SwitchCaseSemicolonToColonFixer.
+        // NoTrailingCommaInListCallFixer, NoUselessReturnFixer, NoWhitespaceInBlankLineFixer, SpaceAfterSemicolonFixer, SwitchCaseSemicolonToColonFixer.
         return 26;
     }
 

src/Fixer/Whitespace/NoWhitespaceInBlankLinesFixer.php → src/Fixer/Whitespace/NoWhitespaceInBlankLineFixer.php

@@ -18,7 +18,7 @@ use PhpCsFixer\Tokenizer\Tokens;
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  */
-final class NoWhitespaceInBlankLinesFixer extends AbstractFixer
+final class NoWhitespaceInBlankLineFixer extends AbstractFixer
 {
     /**
      * {@inheritdoc}

src/RuleSet.php

@@ -85,7 +85,7 @@ final class RuleSet implements RuleSetInterface
             'no_unreachable_default_argument_value' => true,
             'no_unused_imports' => true,
             'no_whitespace_before_comma_in_array' => true,
-            'no_whitespace_in_blank_lines' => true,
+            'no_whitespace_in_blank_line' => true,
             'normalize_index_brace' => true,
             'object_operator_without_whitespace' => true,
             'phpdoc_align' => true,

tests/Fixer/Whitespace/NoWhitespaceInBlankLinesFixerTest.php → tests/Fixer/Whitespace/NoWhitespaceInBlankLineFixerTest.php

@@ -19,7 +19,7 @@ use PhpCsFixer\Test\AbstractFixerTestCase;
  *
  * @internal
  */
-final class NoWhitespaceInBlankLinesFixerTest extends AbstractFixerTestCase
+final class NoWhitespaceInBlankLineFixerTest extends AbstractFixerTestCase
 {
     /**
      * @dataProvider provideCases

tests/FixerFactoryTest.php

@@ -232,17 +232,17 @@ final class FixerFactoryTest extends \PHPUnit_Framework_TestCase
             array($fixers['unary_operator_spaces'], $fixers['not_operator_with_successor_space']),
             array($fixers['unix_line_endings'], $fixers['single_blank_line_at_eof']),
             array($fixers['simplified_null_return'], $fixers['no_useless_return']), // tested also in: simplified_null_return,no_useless_return.test
-            array($fixers['no_useless_return'], $fixers['no_whitespace_in_blank_lines']), // tested also in: no_useless_return,no_whitespace_in_blank_lines.test
+            array($fixers['no_useless_return'], $fixers['no_whitespace_in_blank_line']), // tested also in: no_useless_return,no_whitespace_in_blank_line.test
             array($fixers['no_useless_return'], $fixers['no_extra_consecutive_blank_lines']), // tested also in: no_useless_return,no_extra_consecutive_blank_lines.test
             array($fixers['no_useless_return'], $fixers['blank_line_before_return']), // tested also in: no_useless_return,blank_line_before_return.test
             array($fixers['no_empty_phpdoc'], $fixers['no_extra_consecutive_blank_lines']), // tested also in: no_empty_phpdoc,no_extra_consecutive_blank_lines.test
             array($fixers['no_empty_phpdoc'], $fixers['no_trailing_whitespace']), // tested also in: no_empty_phpdoc,no_trailing_whitespace.test
-            array($fixers['no_empty_phpdoc'], $fixers['no_whitespace_in_blank_lines']), // tested also in: no_empty_phpdoc,no_whitespace_in_blank_lines.test
+            array($fixers['no_empty_phpdoc'], $fixers['no_whitespace_in_blank_line']), // tested also in: no_empty_phpdoc,no_whitespace_in_blank_line.test
             array($fixers['phpdoc_no_access'], $fixers['no_empty_phpdoc']), // tested also in: phpdoc_no_access,no_empty_phpdoc.test
             array($fixers['phpdoc_no_empty_return'], $fixers['no_empty_phpdoc']), // tested also in: phpdoc_no_empty_return,no_empty_phpdoc.test
             array($fixers['phpdoc_no_package'], $fixers['no_empty_phpdoc']), // tested also in: phpdoc_no_package,no_empty_phpdoc.test
             array($fixers['combine_consecutive_unsets'], $fixers['space_after_semicolon']), // tested also in: combine_consecutive_unsets,space_after_semicolon.test
-            array($fixers['combine_consecutive_unsets'], $fixers['no_whitespace_in_blank_lines']), // tested also in: combine_consecutive_unsets,no_whitespace_in_blank_lines.test
+            array($fixers['combine_consecutive_unsets'], $fixers['no_whitespace_in_blank_line']), // tested also in: combine_consecutive_unsets,no_whitespace_in_blank_lines.test
             array($fixers['combine_consecutive_unsets'], $fixers['no_trailing_whitespace']), // tested also in: combine_consecutive_unsets,no_trailing_whitespace.test
             array($fixers['combine_consecutive_unsets'], $fixers['no_extra_consecutive_blank_lines']), // tested also in: combine_consecutive_unsets,no_extra_consecutive_blank_lines.test
             array($fixers['phpdoc_type_to_var'], $fixers['phpdoc_single_line_var_spacing']), // tested also in: phpdoc_type_to_var,phpdoc_single_line_var_spacing.test
@@ -250,7 +250,7 @@ final class FixerFactoryTest extends \PHPUnit_Framework_TestCase
             array($fixers['phpdoc_to_comment'], $fixers['no_empty_comment']), // tested also in: phpdoc_to_comment,no_empty_comment.test
             array($fixers['no_empty_comment'], $fixers['no_extra_consecutive_blank_lines']), // tested also in: no_empty_comment,no_extra_consecutive_blank_lines.test
             array($fixers['no_empty_comment'], $fixers['no_trailing_whitespace']), // tested also in: no_empty_comment,no_trailing_whitespace.test
-            array($fixers['no_empty_comment'], $fixers['no_whitespace_in_blank_lines']), // tested also in: no_empty_comment,no_whitespace_in_blank_lines.test
+            array($fixers['no_empty_comment'], $fixers['no_whitespace_in_blank_line']), // tested also in: no_empty_comment,no_whitespace_in_blank_line.test
             array($fixers['no_alias_functions'], $fixers['php_unit_dedicate_assert']), // tested also in: no_alias_functions,php_unit_dedicate_assert.test
             array($fixers['no_empty_statement'], $fixers['braces']),
             array($fixers['no_empty_statement'], $fixers['combine_consecutive_unsets']), // tested also in: no_empty_statement,combine_consecutive_unsets.test
@@ -260,7 +260,7 @@ final class FixerFactoryTest extends \PHPUnit_Framework_TestCase
             array($fixers['no_empty_statement'], $fixers['no_trailing_whitespace']), // tested also in: no_empty_statement,no_trailing_whitespace.test
             array($fixers['no_empty_statement'], $fixers['no_useless_else']), // tested also in: no_empty_statement,no_useless_else.test
             array($fixers['no_empty_statement'], $fixers['no_useless_return']), // tested also in: no_empty_statement,no_useless_return.test
-            array($fixers['no_empty_statement'], $fixers['no_whitespace_in_blank_lines']), // tested also in: no_empty_statement,no_whitespace_in_blank_lines.test
+            array($fixers['no_empty_statement'], $fixers['no_whitespace_in_blank_line']), // tested also in: no_empty_statement,no_whitespace_in_blank_line.test
             array($fixers['no_empty_statement'], $fixers['space_after_semicolon']), // tested also in: no_empty_statement,space_after_semicolon.test
             array($fixers['no_empty_statement'], $fixers['switch_case_semicolon_to_colon']), // tested also in: no_empty_statement,switch_case_semicolon_to_colon.test
             array($fixers['no_useless_else'], $fixers['braces']),
@@ -268,7 +268,7 @@ final class FixerFactoryTest extends \PHPUnit_Framework_TestCase
             array($fixers['no_useless_else'], $fixers['no_extra_consecutive_blank_lines']), // tested also in: no_useless_else,no_extra_consecutive_blank_lines.test
             array($fixers['no_useless_else'], $fixers['no_useless_return']), // tested also in: no_useless_else,no_useless_return.test
             array($fixers['no_useless_else'], $fixers['no_trailing_whitespace']), // tested also in: no_useless_else,no_trailing_whitespace.test
-            array($fixers['no_useless_else'], $fixers['no_whitespace_in_blank_lines']), // tested also in: no_useless_else,no_whitespace_in_blank_lines.test
+            array($fixers['no_useless_else'], $fixers['no_whitespace_in_blank_line']), // tested also in: no_useless_else,no_whitespace_in_blank_line.test
         );
 
         // prepare bulk tests for phpdoc fixers to test that: