Merge branch '8.5' into 9.5

sebastianbergmann · Sep 23, 2022 · 186775f · 186775f
2 parents 9be9973 + fe26cfb
commit 186775f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -157,8 +157,7 @@
         'no_superfluous_phpdoc_tags' => [
             'allow_mixed' => true,
         ],
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_trailing_whitespace_in_string' => true,