From 8d69657f71bee91f3b7ad48c38e13aa0f86aaf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 19 Aug 2022 10:12:42 +0200 Subject: [PATCH] Enhancement: Enable ensure_single_space option of whitespace_after_comma_in_array fixer --- CHANGELOG.md | 2 ++ src/RuleSet/Php74.php | 2 +- src/RuleSet/Php80.php | 2 +- src/RuleSet/Php81.php | 2 +- test/Unit/RuleSet/Php74Test.php | 2 +- test/Unit/RuleSet/Php80Test.php | 2 +- test/Unit/RuleSet/Php81Test.php | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65775c67..ba151e43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ For a full diff see [`4.6.0...main`][4.6.0...main]. ### Changed - Updated `friendsofphp/php-cs-fixer` ([#642]), by [@dependabot] +- Configured the `whitespace_after_comma_in_array` fixer to ensure a single space using the `'ensure_single_space` option ([#645]), by [@localheinz] ### Fixed @@ -722,6 +723,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#637]: https://github.com/ergebnis/php-cs-fixer-config/pull/637 [#642]: https://github.com/ergebnis/php-cs-fixer-config/pull/642 [#644]: https://github.com/ergebnis/php-cs-fixer-config/pull/644 +[#645]: https://github.com/ergebnis/php-cs-fixer-config/pull/645 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 3f75871c..f442b60a 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -760,7 +760,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index e89107ae..3b9004d4 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -763,7 +763,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 649987c7..fd9ced4b 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -766,7 +766,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 8df9eaf7..182485e6 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -766,7 +766,7 @@ final class Php74Test extends ExplicitRuleSetTestCase ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 238ee482..e184e7e7 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -769,7 +769,7 @@ final class Php80Test extends ExplicitRuleSetTestCase ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 8c58947e..2fa490fb 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -772,7 +772,7 @@ final class Php81Test extends ExplicitRuleSetTestCase ], 'void_return' => true, 'whitespace_after_comma_in_array' => [ - 'ensure_single_space' => false, + 'ensure_single_space' => true, ], 'yoda_style' => [ 'always_move_variable' => true,