Configure new fixers

CodeIgniter · Jul 8, 2023 · 61aea09 · 61aea09
1 parent 44c52a4
commit 61aea09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-tokenizer": "*",
-        "friendsofphp/php-cs-fixer": "^3.18",
+        "friendsofphp/php-cs-fixer": "^3.20",
         "nexusphp/cs-config": "^3.6"
     },
     "require-dev": {

diff --git a/src/CodeIgniter4.php b/src/CodeIgniter4.php
@@ -172,7 +172,6 @@ public function __construct()
                     'pi',
                 ],
             ],
-            'function_typehint_space'          => true,
             'general_phpdoc_annotation_remove' => [
                 'annotations' => [
                     'author',
@@ -304,6 +303,7 @@ public function __construct()
             'normalize_index_brace'                            => true,
             'not_operator_with_space'                          => false,
             'not_operator_with_successor_space'                => true,
+            'nullable_type_declaration'                        => false, // requires 8.0+
             'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
             'object_operator_without_whitespace'               => true,
             'octal_notation'                                   => false, // requires 8.1+
@@ -333,6 +333,7 @@ public function __construct()
                     'assertNotSame',
                 ],
             ],
+            'php_unit_data_provider_name'            => false,
             'php_unit_data_provider_static'          => false,
             'php_unit_dedicate_assert'               => ['target' => 'newest'],
             'php_unit_dedicate_assert_internal_type' => ['target' => 'newest'],
@@ -599,8 +600,9 @@ public function __construct()
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],
-            'trim_array_spaces' => true,
-            'types_spaces'      => [
+            'trim_array_spaces'       => true,
+            'type_declaration_spaces' => ['elements' => ['function', 'property']],
+            'types_spaces'            => [
                 'space'                => 'none',
                 'space_multiple_catch' => 'none',
             ],