Skip to content

Commit 3a4cffc

Browse files
authored
Merge pull request #5254 from paulbalandan/php-cs-fixer-cleanup
Cleanup php-cs-fixer config files
2 parents fed4a33 + b648d2d commit 3a4cffc

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

.no-header.php-cs-fixer.dist.php

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,7 @@
2727
])
2828
->notName('#Logger\.php$#');
2929

30-
$overrides = [
31-
// @TODO Remove once these are live in coding-standard
32-
'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
33-
'class_attributes_separation' => [
34-
'elements' => [
35-
'const' => 'none',
36-
'property' => 'none',
37-
'method' => 'one',
38-
'trait_import' => 'none',
39-
],
40-
],
41-
'control_structure_continuation_position' => ['position' => 'same_line'],
42-
'empty_loop_condition' => ['style' => 'while'],
43-
'integer_literal_case' => true,
44-
'modernize_strpos' => false, // requires 8.0+
45-
'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
46-
'no_space_around_double_colon' => true,
47-
'octal_notation' => false, // requires 8.1+
48-
'string_length_to_empty' => true,
49-
];
30+
$overrides = [];
5031

5132
$options = [
5233
'cacheFile' => 'build/.no-header.php-cs-fixer.cache',

.php-cs-fixer.dist.php

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,7 @@
3434
__DIR__ . '/spark',
3535
]);
3636

37-
$overrides = [
38-
// @TODO Remove once these are live in coding-standard
39-
'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
40-
'class_attributes_separation' => [
41-
'elements' => [
42-
'const' => 'none',
43-
'property' => 'none',
44-
'method' => 'one',
45-
'trait_import' => 'none',
46-
],
47-
],
48-
'control_structure_continuation_position' => ['position' => 'same_line'],
49-
'empty_loop_condition' => ['style' => 'while'],
50-
'integer_literal_case' => true,
51-
'modernize_strpos' => false, // requires 8.0+
52-
'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
53-
'no_space_around_double_colon' => true,
54-
'octal_notation' => false, // requires 8.1+
55-
'string_length_to_empty' => true,
56-
];
37+
$overrides = [];
5738

5839
$options = [
5940
'cacheFile' => 'build/.php-cs-fixer.cache',

0 commit comments

Comments
 (0)