Update to PHP-CS-Fixer ^3.16 (#22)

Slamdunk · Apr 5, 2023 · d6b2b6d · d6b2b6d
1 parent 7cb5cb3
commit d6b2b6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -13,12 +13,12 @@
         "php": "~8.1.0 || ~8.2.0",
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
-        "friendsofphp/php-cs-fixer": "^3.15.1"
+        "friendsofphp/php-cs-fixer": "^3.16"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10.6",
-        "phpstan/phpstan-phpunit": "^1.3.10",
-        "phpunit/phpunit": "^10.0.16",
+        "phpstan/phpstan": "^1.10.11",
+        "phpstan/phpstan-phpunit": "^1.3.11",
+        "phpunit/phpunit": "^10.0.19",
         "slam/php-debug-r": "^1.8.0",
         "slam/phpstan-extensions": "^6.0.0"
     },

diff --git a/lib/Config.php b/lib/Config.php
@@ -5,7 +5,6 @@
 namespace SlamCsFixer;
 
 use PhpCsFixer\Config as PhpCsFixerConfig;
-use PhpCsFixer\Fixer as MainFixer;
 
 final class Config extends PhpCsFixerConfig
 {
@@ -19,22 +18,17 @@ final class Config extends PhpCsFixerConfig
         'Slam/final_abstract_public'                        => true,
         'Slam/final_internal_class'                         => true,
         'Slam/function_reference_space'                     => true,
-        'Slam/php_only_braces'                              => true,
         'Slam/php_only_slam_inline_comment_spacer'          => true,
         'Slam/utf8'                                         => true,
         'align_multiline_comment'                           => ['comment_type' => 'all_multiline'],
         'binary_operator_spaces'                            => ['default' => 'align_single_space'],
-        'braces'                                            => false,   // See Slam/php_only_braces
         'combine_consecutive_issets'                        => false,
         'combine_consecutive_unsets'                        => false,
         'comment_to_phpdoc'                                 => false,
         'concat_space'                                      => ['spacing' => 'one'],
-        'control_structure_braces'                          => true,
-        'control_structure_continuation_position'           => true,
         'curly_braces_position'                             => true,
         'date_time_create_from_format_call'                 => true,
         'date_time_immutable'                               => false,
-        'declare_parentheses'                               => true,
         'error_suppression'                                 => false,
         'final_class'                                       => false,
         'final_internal_class'                              => false,
@@ -50,7 +44,6 @@ final class Config extends PhpCsFixerConfig
         'native_function_invocation'                        => ['include' => ['@internal']],
         'no_blank_lines_before_namespace'                   => false,
         'no_multiline_whitespace_around_double_arrow'       => false,
-        'no_multiple_statements_per_line'                   => true,
         'no_superfluous_phpdoc_tags'                        => ['allow_mixed' => true],
         'not_operator_with_space'                           => false,
         'not_operator_with_successor_space'                 => true,
@@ -78,7 +71,6 @@ final class Config extends PhpCsFixerConfig
         'simplified_null_return'                            => false,
         'single_line_throw'                                 => false,
         'space_after_semicolon'                             => true,
-        'statement_indentation'                             => true,
         'static_lambda'                                     => false,
         'unary_operator_spaces'                             => false,
         'use_arrow_functions'                               => false,
@@ -96,7 +88,6 @@ public function __construct(array $overriddenRules = [])
             new FinalInternalClassFixer(),
             new FunctionReferenceSpaceFixer(),
             new PhpFileOnlyProxyFixer(new InlineCommentSpacerFixer()),
-            new PhpFileOnlyProxyFixer(new MainFixer\Basic\BracesFixer()),
             new Utf8Fixer(),
         ]);