composer(deps): Bump friendsofphp/php-cs-fixer from 3.15.1 to 3.16.0

CHANGELOG.md

@@ -8,6 +8,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`5.3.3...main`][5.3.3...main].
 
+### Changed
+
+- Updated `friendsofphp/php-cs-fixer` ([#746]), by [@dependabot]
+- Enabled and configured the `single_space_around_construct` fixer as a replacement for the deprecated `single_space_after_construct` fixer ([#746]), by [@localheinz]
+
+### Fixed
+
+- Stopped configuring the deprecated `braces` fixer ([#746]), by [@localheinz]
+- Stopped configuring the deprecated `single_space_after_construct` fixer ([#746]), by [@localheinz]
+- Configured the newly added `force` option of the `php_unit_data_provider_static` fixer ([#746]), by [@localheinz]
+
 ## [`5.3.3`][5.3.3]
 
 For a full diff see [`5.3.2...5.3.3`][5.3.2...5.3.3].
@@ -882,6 +893,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#718]: https://github.com/ergebnis/php-cs-fixer-config/pull/718
 [#737]: https://github.com/ergebnis/php-cs-fixer-config/pull/737
 [#738]: https://github.com/ergebnis/php-cs-fixer-config/pull/738
+[#746]: https://github.com/ergebnis/php-cs-fixer-config/pull/746
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

composer.json

@@ -17,7 +17,7 @@
   "require": {
     "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
     "ext-filter": "*",
-    "friendsofphp/php-cs-fixer": "~3.15.1"
+    "friendsofphp/php-cs-fixer": "~3.16.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.30.2",

src/RuleSet/Php80.php

@@ -61,13 +61,6 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
             ],
         ],
         'blank_line_between_import_groups' => false,
-        'braces' => [
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-            'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'next',
-        ],
         'cast_spaces' => [
             'space' => 'single',
         ],
@@ -448,7 +441,9 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
                 'assertSame',
             ],
         ],
-        'php_unit_data_provider_static' => true,
+        'php_unit_data_provider_static' => [
+            'force' => false,
+        ],
         'php_unit_dedicate_assert' => [
             'target' => 'newest',
         ],
@@ -697,8 +692,9 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
         'single_quote' => [
             'strings_containing_single_quote_chars' => false,
         ],
-        'single_space_after_construct' => [
-            'constructs' => [
+        'single_space_around_construct' => [
+            'constructs_contain_a_single_space' => [],
+            'constructs_followed_by_a_single_space' => [
                 'abstract',
                 'as',
                 'attribute',
@@ -759,6 +755,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
                 'yield',
                 'yield_from',
             ],
+            'constructs_preceded_by_a_single_space' => [],
         ],
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => [

src/RuleSet/Php81.php

@@ -61,13 +61,6 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
             ],
         ],
         'blank_line_between_import_groups' => false,
-        'braces' => [
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-            'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'next',
-        ],
         'cast_spaces' => [
             'space' => 'single',
         ],
@@ -449,7 +442,9 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
                 'assertSame',
             ],
         ],
-        'php_unit_data_provider_static' => true,
+        'php_unit_data_provider_static' => [
+            'force' => false,
+        ],
         'php_unit_dedicate_assert' => [
             'target' => 'newest',
         ],
@@ -698,8 +693,9 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
         'single_quote' => [
             'strings_containing_single_quote_chars' => false,
         ],
-        'single_space_after_construct' => [
-            'constructs' => [
+        'single_space_around_construct' => [
+            'constructs_contain_a_single_space' => [],
+            'constructs_followed_by_a_single_space' => [
                 'abstract',
                 'as',
                 'attribute',
@@ -716,7 +712,6 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
                 'echo',
                 'else',
                 'elseif',
-                'enum',
                 'extends',
                 'final',
                 'finally',
@@ -744,7 +739,6 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
                 'private',
                 'protected',
                 'public',
-                'readonly',
                 'require',
                 'require_once',
                 'return',
@@ -762,6 +756,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
                 'yield',
                 'yield_from',
             ],
+            'constructs_preceded_by_a_single_space' => [],
         ],
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => [

src/RuleSet/Php82.php

@@ -61,13 +61,6 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
             ],
         ],
         'blank_line_between_import_groups' => false,
-        'braces' => [
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-            'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'next',
-        ],
         'cast_spaces' => [
             'space' => 'single',
         ],
@@ -449,7 +442,9 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
                 'assertSame',
             ],
         ],
-        'php_unit_data_provider_static' => true,
+        'php_unit_data_provider_static' => [
+            'force' => false,
+        ],
         'php_unit_dedicate_assert' => [
             'target' => 'newest',
         ],
@@ -698,8 +693,9 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
         'single_quote' => [
             'strings_containing_single_quote_chars' => false,
         ],
-        'single_space_after_construct' => [
-            'constructs' => [
+        'single_space_around_construct' => [
+            'constructs_contain_a_single_space' => [],
+            'constructs_followed_by_a_single_space' => [
                 'abstract',
                 'as',
                 'attribute',
@@ -716,7 +712,6 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
                 'echo',
                 'else',
                 'elseif',
-                'enum',
                 'extends',
                 'final',
                 'finally',
@@ -744,7 +739,6 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
                 'private',
                 'protected',
                 'public',
-                'readonly',
                 'require',
                 'require_once',
                 'return',
@@ -762,6 +756,7 @@ final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
                 'yield',
                 'yield_from',
             ],
+            'constructs_preceded_by_a_single_space' => [],
         ],
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => [

test/Unit/RuleSet/Php80Test.php

@@ -67,13 +67,6 @@ final class Php80Test extends ExplicitRuleSetTestCase
             ],
         ],
         'blank_line_between_import_groups' => false,
-        'braces' => [
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-            'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'next',
-        ],
         'cast_spaces' => [
             'space' => 'single',
         ],
@@ -454,7 +447,9 @@ final class Php80Test extends ExplicitRuleSetTestCase
                 'assertSame',
             ],
         ],
-        'php_unit_data_provider_static' => true,
+        'php_unit_data_provider_static' => [
+            'force' => false,
+        ],
         'php_unit_dedicate_assert' => [
             'target' => 'newest',
         ],
@@ -703,8 +698,9 @@ final class Php80Test extends ExplicitRuleSetTestCase
         'single_quote' => [
             'strings_containing_single_quote_chars' => false,
         ],
-        'single_space_after_construct' => [
-            'constructs' => [
+        'single_space_around_construct' => [
+            'constructs_contain_a_single_space' => [],
+            'constructs_followed_by_a_single_space' => [
                 'abstract',
                 'as',
                 'attribute',
@@ -765,6 +761,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
                 'yield',
                 'yield_from',
             ],
+            'constructs_preceded_by_a_single_space' => [],
         ],
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => [

test/Unit/RuleSet/Php81Test.php

@@ -67,13 +67,6 @@ final class Php81Test extends ExplicitRuleSetTestCase
             ],
         ],
         'blank_line_between_import_groups' => false,
-        'braces' => [
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-            'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'next',
-        ],
         'cast_spaces' => [
             'space' => 'single',
         ],
@@ -455,7 +448,9 @@ final class Php81Test extends ExplicitRuleSetTestCase
                 'assertSame',
             ],
         ],
-        'php_unit_data_provider_static' => true,
+        'php_unit_data_provider_static' => [
+            'force' => false,
+        ],
         'php_unit_dedicate_assert' => [
             'target' => 'newest',
         ],
@@ -704,8 +699,9 @@ final class Php81Test extends ExplicitRuleSetTestCase
         'single_quote' => [
             'strings_containing_single_quote_chars' => false,
         ],
-        'single_space_after_construct' => [
-            'constructs' => [
+        'single_space_around_construct' => [
+            'constructs_contain_a_single_space' => [],
+            'constructs_followed_by_a_single_space' => [
                 'abstract',
                 'as',
                 'attribute',
@@ -722,7 +718,6 @@ final class Php81Test extends ExplicitRuleSetTestCase
                 'echo',
                 'else',
                 'elseif',
-                'enum',
                 'extends',
                 'final',
                 'finally',
@@ -750,7 +745,6 @@ final class Php81Test extends ExplicitRuleSetTestCase
                 'private',
                 'protected',
                 'public',
-                'readonly',
                 'require',
                 'require_once',
                 'return',
@@ -768,6 +762,7 @@ final class Php81Test extends ExplicitRuleSetTestCase
                 'yield',
                 'yield_from',
             ],
+            'constructs_preceded_by_a_single_space' => [],
         ],
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => [