Upgrade PHP-CS-Fixer

Author: natanfelles

composer.json

@@ -32,7 +32,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "friendsofphp/php-cs-fixer": "~3.11.0"
+        "friendsofphp/php-cs-fixer": "~3.21.0"
     },
     "require-dev": {
         "ext-xdebug": "*",

src/Config.php

@@ -41,12 +41,9 @@ protected function prepareRules() : void
             'blank_line_after_namespace' => true,
             'blank_line_after_opening_tag' => false,
             'blank_line_before_statement' => false,
-            'braces' => [
-                'allow_single_line_anonymous_class_with_empty_body' => false,
-                'allow_single_line_closure' => false,
-                'position_after_anonymous_constructs' => 'same',
-                'position_after_control_structures' => 'same',
-                'position_after_functions_and_oop_constructs' => 'next',
+            'blank_lines_before_namespace' => [
+                'min_line_breaks' => 0,
+                'max_line_breaks' => 0,
             ],
             'cast_spaces' => [
                 'space' => 'single',
@@ -71,6 +68,9 @@ protected function prepareRules() : void
                 'spacing' => 'one',
             ],
             'constant_case' => true,
+            'control_structure_braces' => true,
+            'control_structure_continuation_position' => ['position' => 'same_line'],
+            'curly_braces_position' => true,
             'date_time_immutable' => false,
             'declare_equal_normalize' => [
                 'space' => 'none',
@@ -101,7 +101,6 @@ protected function prepareRules() : void
                 'closure_function_spacing' => 'one',
             ],
             'function_to_constant' => true,
-            'function_typehint_space' => true,
             'general_phpdoc_annotation_remove' => [],
             /*'header_comment' => [
                 'comment_type' => 'comment',
@@ -150,7 +149,6 @@ protected function prepareRules() : void
             'no_binary_string' => true,
             'no_blank_lines_after_class_opening' => true,
             'no_blank_lines_after_phpdoc' => true,
-            'no_blank_lines_before_namespace' => true,
             'no_break_comment' => false,
             'no_closing_tag' => true,
             'no_empty_comment' => false,
@@ -177,6 +175,7 @@ protected function prepareRules() : void
             'no_leading_namespace_whitespace' => true,
             'no_mixed_echo_print' => true,
             'no_multiline_whitespace_around_double_arrow' => true,
+            'no_multiple_statements_per_line' => true,
             'no_null_property_initialization' => true,
             'no_php4_constructor' => false,
             'no_short_bool_cast' => true,
@@ -262,12 +261,12 @@ protected function prepareRules() : void
             'short_scalar_cast' => true,
             'simplified_null_return' => false,
             'single_blank_line_at_eof' => true,
-            'single_blank_line_before_namespace' => false,
             'single_class_element_per_statement' => true,
             'single_import_per_statement' => true,
             'single_line_after_imports' => true,
             'single_line_comment_style' => true,
             'single_quote' => true,
+            'single_space_around_construct' => true,
             'space_after_semicolon' => true,
             'standardize_increment' => true,
             'standardize_not_equals' => true,
@@ -281,6 +280,7 @@ protected function prepareRules() : void
             'ternary_to_null_coalescing' => true,
             'trailing_comma_in_multiline' => ['elements' => ['arrays']],
             'trim_array_spaces' => true,
+            'type_declaration_spaces' => ['elements' => ['function', 'property']],
             'unary_operator_spaces' => true,
             'visibility_required' => true,
             'void_return' => true,