Skip to content

Commit 33303b3

Browse files
committed
Disable phpdoc_types_order while waiting for PHP-CS-Fixer/PHP-CS-Fixer#5921.
1 parent 624505c commit 33303b3

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": ">= 7.1.3",
14-
"friendsofphp/php-cs-fixer": "^3.0, !=3.0.1, !=3.0.2, !=3.0.3, !=3.1.0, !=3.2.0, !=3.2.1, !=3.3.0, !=3.3.1, !=3.3.2",
14+
"friendsofphp/php-cs-fixer": "^3.3",
1515
"symfony/yaml": "^3 || ^4 || ^5"
1616
},
1717
"autoload": {

config/php/phpcsfixer.rules.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,8 @@ parameters:
296296
phpdoc_trim: true
297297
phpdoc_trim_consecutive_blank_line_separation: true
298298
phpdoc_types: true
299-
phpdoc_types_order:
300-
null_adjustment: always_last
301-
sort_algorithm: alpha
299+
# Disabled until https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5921 is fixed
300+
phpdoc_types_order: false
302301
phpdoc_var_annotation_correct_order: true
303302
phpdoc_var_without_name: true
304303
pow_to_exponentiation: true

0 commit comments

Comments
 (0)