Merge branch '4.1' · sebastianbergmann/php-file-iterator@c5572d4 (original) (raw)
`@@ -25,19 +25,15 @@
`
25
25
`'backtick_to_shell_exec' => true,
`
26
26
`'binary_operator_spaces' => [
`
27
27
`'operators' => [
`
28
``
`-
'=' => 'align_single_space_minimal',
`
``
28
`+
'*=' => 'align_single_space_minimal',
`
29
29
`'+=' => 'align_single_space_minimal',
`
30
30
`'-=' => 'align_single_space_minimal',
`
31
``
`-
'*=' => 'align_single_space_minimal',
`
32
31
`'/=' => 'align_single_space_minimal',
`
``
32
`+
'=' => 'align_single_space_minimal',
`
33
33
`'=>' => 'align_single_space_minimal',
`
34
34
` ],
`
35
35
` ],
`
36
36
`'blank_line_after_namespace' => true,
`
37
``
`-
'blank_lines_before_namespace' => [
`
38
``
`-
'max_line_breaks' => 1,
`
39
``
`-
'min_line_breaks' => 0,
`
40
``
`-
],
`
41
37
`'blank_line_before_statement' => [
`
42
38
`'statements' => [
`
43
39
`'break',
`
65
61
`'yield_from',
`
66
62
` ],
`
67
63
` ],
`
``
64
`+
'blank_lines_before_namespace' => [
`
``
65
`+
'max_line_breaks' => 1,
`
``
66
`+
'min_line_breaks' => 0,
`
``
67
`+
],
`
``
68
`+
'braces_position' => [
`
``
69
`+
'anonymous_classes_opening_brace' => 'next_line_unless_newline_at_signature_end',
`
``
70
`+
'anonymous_functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
`
``
71
`+
],
`
68
72
`'cast_spaces' => true,
`
69
73
`'class_attributes_separation' => [
`
70
74
`'elements' => [
`
`@@ -78,15 +82,11 @@
`
78
82
`'combine_consecutive_issets' => true,
`
79
83
`'combine_consecutive_unsets' => true,
`
80
84
`'combine_nested_dirname' => true,
`
81
``
`-
'compact_nullable_typehint' => true,
`
``
85
`+
'compact_nullable_type_declaration' => true,
`
82
86
`'concat_space' => ['spacing' => 'one'],
`
83
87
`'constant_case' => true,
`
84
88
`'control_structure_braces' => true,
`
85
89
`'control_structure_continuation_position' => true,
`
86
``
`-
'curly_braces_position' => [
`
87
``
`-
'anonymous_functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
`
88
``
`-
'anonymous_classes_opening_brace' => 'next_line_unless_newline_at_signature_end',
`
89
``
`-
],
`
90
90
`'declare_equal_normalize' => ['space' => 'none'],
`
91
91
`'declare_parentheses' => true,
`
92
92
`'declare_strict_types' => true,
`
`@@ -102,7 +102,6 @@
`
102
102
`'fully_qualified_strict_types' => true,
`
103
103
`'function_declaration' => true,
`
104
104
`'function_to_constant' => true,
`
105
``
`-
'function_typehint_space' => true,
`
106
105
`'get_class_to_class_keyword' => true,
`
107
106
`'global_namespace_import' => [
`
108
107
`'import_classes' => true,
`
143
142
`'@internal',
`
144
143
` ],
`
145
144
` ],
`
146
``
`-
'native_function_type_declaration_casing' => true,
`
147
``
`-
'new_with_braces' => [
`
148
``
`-
'named_class' => false,
`
``
145
`+
'native_type_declaration_casing' => true,
`
``
146
`+
'new_with_parentheses' => [
`
149
147
`'anonymous_class' => false,
`
``
148
`+
'named_class' => false,
`
150
149
` ],
`
151
150
`'no_alias_functions' => true,
`
152
151
`'no_alias_language_construct_call' => true,
`
181
180
`'no_trailing_whitespace' => true,
`
182
181
`'no_trailing_whitespace_in_comment' => true,
`
183
182
`'no_trailing_whitespace_in_string' => true,
`
``
183
`+
'no_unneeded_braces' => true,
`
184
184
`'no_unneeded_control_parentheses' => true,
`
185
``
`-
'no_unneeded_curly_braces' => true,
`
186
185
`'no_unneeded_final_method' => true,
`
187
186
`'no_unneeded_import_alias' => true,
`
188
187
`'no_unreachable_default_argument_value' => true,
`
341
340
`'whitespace_after_comma_in_array' => true,
`
342
341
` ]);
`
343
342
``
``
343
`+
$config->setCacheFile(DIR . '/.php-cs-fixer.cache/' . sha1(@trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'))));
`
``
344
+
344
345
`return $config;
`