diff --git a/.php_cs.dist b/.php_cs.dist index 0649143e..c2761677 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -17,28 +17,24 @@ $paths = [ ]; $rules = [ // house rules where PSR series is silent - 'align_multiline_comment' => ['comment_type' => "phpdocs_only"], - 'array_syntax' => ['syntax' => "short"], - 'binary_operator_spaces' => [ + 'align_multiline_comment' => ['comment_type' => "phpdocs_only"], + 'array_syntax' => ['syntax' => "short"], + 'binary_operator_spaces' => [ 'default' => "single_space", 'operators' => ['=>' => "align_single_space"], ], 'cast_spaces' => ['space' => "single"], 'concat_space' => ['spacing' => "none"], - 'function_typehint_space' => true, 'list_syntax' => ['syntax' => "short"], 'magic_constant_casing' => true, 'magic_method_casing' => true, 'modernize_types_casting' => true, 'native_function_casing' => true, 'native_function_type_declaration_casing' => true, - 'new_with_braces' => false, // no option to specify absence of braces - 'no_alternative_syntax' => true, 'no_binary_string' => true, 'no_blank_lines_after_phpdoc' => true, 'no_empty_comment' => true, 'no_empty_phpdoc' => true, - 'no_empty_statement' => true, 'no_extra_blank_lines' => true, // this could probably use more configuration 'no_mixed_echo_print' => ['use' => "echo"], 'no_short_bool_cast' => true, @@ -47,11 +43,9 @@ $rules = [ 'no_unneeded_curly_braces' => true, 'no_unused_imports' => true, 'no_whitespace_before_comma_in_array' => true, - 'no_whitespace_in_blank_line' => true, 'normalize_index_brace' => true, 'object_operator_without_whitespace' => true, 'pow_to_exponentiation' => true, - 'return_type_declaration' => ['space_before' => "none"], 'set_type_to_cast' => true, 'standardize_not_equals' => true, 'trailing_comma_in_multiline_array' => true, @@ -60,17 +54,25 @@ $rules = [ // PSR standard to apply '@PSR2' => true, // PSR-12 rules; php-cs-fixer does not yet support PSR-12 natively + 'compact_nullable_typehint' => true, 'declare_equal_normalize' => ['space' => "none"], + 'function_typehint_space' => true, 'lowercase_cast' => true, 'lowercase_static_reference' => true, + 'no_alternative_syntax' => true, + 'no_empty_statement' => true, 'no_leading_import_slash' => true, 'no_leading_namespace_whitespace' => true, + 'no_whitespace_in_blank_line' => true, + 'return_type_declaration' => ['space_before' => "none"], + 'single_trait_insert_per_statement' => true, 'short_scalar_cast' => true, 'visibility_required' => ['elements' => ["const", "property", "method"]], // house exceptions to PSR rules - 'braces' => ['position_after_functions_and_oop_constructs' => "same"], - 'function_declaration' => ['closure_function_spacing' => "none"], -]; + 'braces' => ['position_after_functions_and_oop_constructs' => "same"], + 'function_declaration' => ['closure_function_spacing' => "none"], + 'new_with_braces' => false, // no option to specify absence of braces + ]; $finder = \PhpCsFixer\Finder::create(); foreach ($paths as $path) {