From fa5f40929fa4fb0411aaa9d7a5183ea800efedd3 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 3 Jan 2021 08:32:22 +0100 Subject: [PATCH] Sync PHP-CS-Fixer configuration --- .php_cs.dist | 84 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 7 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 1c89105aaf5..1c10a3a1640 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -11,13 +11,17 @@ EOF; $finder = PhpCsFixer\Finder::create() ->files() ->in(__DIR__ . '/src') - ->in(__DIR__ . '/tests/_files') ->in(__DIR__ . '/tests/basic') ->in(__DIR__ . '/tests/end-to-end') ->in(__DIR__ . '/tests/fail') ->in(__DIR__ . '/tests/unit') + ->in(__DIR__ . '/tests/_files') ->notName('*.phpt') - ->notName('ClassWithAllPossibleReturnTypes.php'); + ->notName('ClassWithAllPossibleReturnTypes.php') + ->notName('ClassWithUnionReturnTypes.php') + ->notName('ClassWithStaticReturnTypes.php') + ->notName('ValueObjectWithEqualsMethodWithUnionReturnType.php') + ->notName('ValueObjectWithEqualsMethodThatHasUnionParameterType.php'); return PhpCsFixer\Config::create() ->setFinder($finder) @@ -25,7 +29,9 @@ return PhpCsFixer\Config::create() ->setRules([ 'align_multiline_comment' => true, 'array_indentation' => true, + 'array_push' => true, 'array_syntax' => ['syntax' => 'short'], + 'backtick_to_shell_exec' => true, 'binary_operator_spaces' => [ 'operators' => [ '=' => 'align_single_space_minimal', @@ -61,31 +67,48 @@ return PhpCsFixer\Config::create() 'braces' => true, 'cast_spaces' => true, 'class_attributes_separation' => ['elements' => ['const', 'method', 'property']], + 'class_definition' => true, + 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, + 'combine_nested_dirname' => true, 'compact_nullable_typehint' => true, 'concat_space' => ['spacing' => 'one'], 'constant_case' => true, 'declare_equal_normalize' => ['space' => 'none'], 'declare_strict_types' => true, 'dir_constant' => true, + 'echo_tag_syntax' => true, 'elseif' => true, 'encoding' => true, + 'ereg_to_preg' => true, 'explicit_indirect_variable' => true, 'explicit_string_variable' => true, + 'fopen_flag_order' => true, 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => true, + 'function_to_constant' => true, + 'function_typehint_space' => true, + 'global_namespace_import' => [ + 'import_classes' => true, + 'import_constants' => true, + 'import_functions' => true, + ], 'header_comment' => ['header' => $header, 'separate' => 'none'], 'heredoc_to_nowdoc' => true, + 'implode_call' => true, + 'include' => true, 'increment_style' => [ 'style' => PhpCsFixer\Fixer\Operator\IncrementStyleFixer::STYLE_POST, ], 'indentation_type' => true, 'is_null' => true, + 'lambda_not_used_import' => true, 'line_ending' => true, 'list_syntax' => ['syntax' => 'short'], 'logical_operators' => true, + 'lowercase_cast' => true, 'lowercase_keywords' => true, 'lowercase_static_reference' => true, 'magic_constant_casing' => true, @@ -96,16 +119,19 @@ return PhpCsFixer\Config::create() 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, 'multiline_whitespace_before_semicolons' => true, - 'native_constant_invocation' => true, - 'native_function_casing' => true, - 'native_function_invocation' => true, + 'native_constant_invocation' => false, + 'native_function_casing' => false, + 'native_function_invocation' => false, 'native_function_type_declaration_casing' => true, 'new_with_braces' => false, 'no_alias_functions' => true, + 'no_alias_language_construct_call' => true, 'no_alternative_syntax' => true, + 'no_binary_string' => true, 'no_blank_lines_after_class_opening' => true, 'no_blank_lines_after_phpdoc' => true, 'no_blank_lines_before_namespace' => true, + 'no_break_comment' => true, 'no_closing_tag' => true, 'no_empty_comment' => true, 'no_empty_phpdoc' => true, @@ -119,7 +145,6 @@ return PhpCsFixer\Config::create() 'no_null_property_initialization' => true, 'no_php4_constructor' => true, 'no_short_bool_cast' => true, - 'no_short_echo_tag' => true, 'no_singleline_whitespace_before_semicolons' => true, 'no_spaces_after_function_name' => true, 'no_spaces_around_offset' => true, @@ -132,19 +157,26 @@ return PhpCsFixer\Config::create() 'no_trailing_comma_in_singleline_array' => true, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, + 'no_trailing_whitespace_in_string' => true, 'no_unneeded_control_parentheses' => true, 'no_unneeded_curly_braces' => true, 'no_unneeded_final_method' => true, 'no_unreachable_default_argument_value' => true, + 'no_unset_cast' => true, 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, 'no_useless_return' => true, + 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => true, 'no_whitespace_in_blank_line' => true, 'non_printable_character' => true, 'normalize_index_brace' => true, 'object_operator_without_whitespace' => true, + 'operator_linebreak' => [ + 'only_booleans' => true, + 'position' => 'end', + ], 'ordered_class_elements' => [ 'order' => [ 'use_trait', @@ -169,28 +201,54 @@ return PhpCsFixer\Config::create() 'method_private_static', ], ], - 'ordered_imports' => true, + 'ordered_imports' => [ + 'imports_order' => [ + PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CONST, + PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_FUNCTION, + PhpCsFixer\Fixer\Import\OrderedImportsFixer::IMPORT_TYPE_CLASS, + ] + ], 'ordered_interfaces' => [ 'direction' => 'ascend', 'order' => 'alpha', ], + 'ordered_traits' => true, + 'php_unit_set_up_tear_down_visibility' => true, + 'php_unit_test_case_static_method_calls' => [ + 'call_type' => 'this', + ], 'phpdoc_add_missing_param_annotation' => false, 'phpdoc_align' => true, 'phpdoc_annotation_without_dot' => true, 'phpdoc_indent' => true, + 'phpdoc_inline_tag_normalizer' => true, 'phpdoc_no_access' => true, + 'phpdoc_no_alias_tag' => true, 'phpdoc_no_empty_return' => true, 'phpdoc_no_package' => true, + 'phpdoc_no_useless_inheritdoc' => true, 'phpdoc_order' => true, + 'phpdoc_order_by_value' => [ + 'annotations' => [ + 'covers', + 'dataProvider', + 'throws', + 'uses', + ], + ], 'phpdoc_return_self_reference' => true, 'phpdoc_scalar' => true, 'phpdoc_separation' => true, 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_summary' => true, + 'phpdoc_tag_casing' => true, + 'phpdoc_tag_type' => true, 'phpdoc_to_comment' => true, 'phpdoc_trim' => true, 'phpdoc_trim_consecutive_blank_line_separation' => true, 'phpdoc_types' => ['groups' => ['simple', 'meta']], 'phpdoc_types_order' => true, + 'phpdoc_var_annotation_correct_order' => true, 'phpdoc_var_without_name' => true, 'pow_to_exponentiation' => true, 'protected_to_private' => true, @@ -204,11 +262,23 @@ return PhpCsFixer\Config::create() 'simple_to_complex_string_variable' => true, 'simplified_null_return' => false, 'single_blank_line_at_eof' => true, + 'single_class_element_per_statement' => true, 'single_import_per_statement' => true, 'single_line_after_imports' => true, 'single_quote' => true, + 'single_space_after_construct' => true, + 'single_trait_insert_per_statement' => true, + 'space_after_semicolon' => true, + 'standardize_increment' => true, 'standardize_not_equals' => true, + 'static_lambda' => true, 'strict_param' => true, + 'string_line_ending' => true, + 'switch_case_semicolon_to_colon' => true, + 'switch_case_space' => true, + 'switch_continue_to_break' => true, + 'ternary_operator_spaces' => true, + 'ternary_to_elvis_operator' => true, 'ternary_to_null_coalescing' => true, 'trailing_comma_in_multiline_array' => true, 'trim_array_spaces' => true,