Update to PHP-CS-Fixer 3.86

Author: theodorejb

.github/workflows/php.yml

@@ -63,4 +63,4 @@ jobs:
 
       - name: Check Formatting
         run: vendor/bin/php-cs-fixer fix -v --dry-run --stop-on-violation --using-cache=no
-        if: ${{ matrix.php == '8.3' }}
+        if: ${{ matrix.php == '8.4' }}

.php-cs-fixer.php

@@ -14,11 +14,11 @@
     ->setRules([
         '@PER-CS' => true,
         'align_multiline_comment' => true,
-        'array_syntax' => true,
         'binary_operator_spaces' => true,
         'class_attributes_separation' => ['elements' => ['method' => 'one']],
         'class_reference_name_casing' => true,
         'clean_namespace' => true,
+        'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'declare_parentheses' => true,
         'integer_literal_case' => true,
@@ -35,24 +35,26 @@
         'no_extra_blank_lines' => true,
         'no_spaces_around_offset' => true,
         'no_superfluous_phpdoc_tags' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unneeded_control_parentheses' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => true,
         'no_useless_return' => true,
         'no_whitespace_before_comma_in_array' => true,
         'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => ['order' => ['use_trait', 'case', 'constant', 'property', 'method']],
         'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'phpdoc_indent' => true,
         'phpdoc_no_empty_return' => true,
+        'phpdoc_order' => true,
+        'phpdoc_param_order' => true,
         'phpdoc_single_line_var_spacing' => true,
         'return_assignment' => true,
         'semicolon_after_instruction' => true,
-        'single_class_element_per_statement' => true,
-        'single_space_around_construct' => true,
         'space_after_semicolon' => true,
         'standardize_not_equals' => true,
         'trim_array_spaces' => true,
         'type_declaration_spaces' => true,
-        'types_spaces' => true,
         'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
     ])
     ->setFinder($finder);

composer.json

@@ -24,8 +24,8 @@
         "shrikeh/teapot": "^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.75",
-        "phpstan/phpstan": "^2.1.14",
+        "friendsofphp/php-cs-fixer": "^3.86",
+        "phpstan/phpstan": "^2.1.22",
         "phpunit/phpunit": "^10.5"
     },
     "autoload": {

src/Entities.php

@@ -217,7 +217,6 @@ public function addEntities(array $entities): array
         foreach ($existingIds as $offset => $id) {
             array_splice($ids, $offset, 0, [$id]);
         }
-        /** @phpstan-ignore return.type */
         return $ids;
     }
 

src/Prop.php

@@ -33,7 +33,7 @@ public function __construct(
         public readonly bool $isDefault = true,
         public readonly string $alias = '',
         public readonly ?string $type = null,
-        public readonly DateTimeZone|null|false $timeZone = false,
+        public readonly DateTimeZone|false|null $timeZone = false,
         public readonly ?Closure $getValue = null,
         public readonly array $dependsOn = [],
         bool $output = true,