Update to PHP-CS-Fixer 3.86

Author: theodorejb

.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

@@ -20,10 +20,10 @@
         "ext-pdo": "*"
     },
     "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",
-        "ramsey/uuid": "^4.2.3"
+        "ramsey/uuid": "^4.9"
     },
     "autoload": {
         "psr-4": {

src/QueryBuilder/Query.php

@@ -12,8 +12,6 @@
  */
 class Query
 {
-    protected Options $options;
-
     private const OPERATOR_MAP = [
         'eq' => '=',
         'ne' => '<>',
@@ -27,6 +25,8 @@ class Query
         'nn' => 'IS NOT NULL',
     ];
 
+    protected Options $options;
+
     public function __construct(Options $options)
     {
         $this->options = $options;
@@ -60,8 +60,8 @@ public function escapeIdentifier(string $identifier): string
     }
 
     /**
-     * @throws \Exception if a column filter is empty
      * @param WhereClause $columnVals
+     * @throws \Exception if a column filter is empty
      */
     public function buildWhereClause(array $columnVals): SqlParams
     {