From 3c1d05429651ba0810d541ef4a003ec6103d5a0f Mon Sep 17 00:00:00 2001 From: Paul Tibbetts Date: Wed, 8 Nov 2023 12:12:10 +0000 Subject: [PATCH] feat: PER CS 2.0 Updates rulesets to use [PER Coding Style 2.0](https://www.php-fig.org/per/coding-style/) This will change the way some fixers apply changes to code but they are now even more in line with "the standards". --- src/RuleSet/Php81.php | 71 +++++++------------------------------------ src/RuleSet/Php82.php | 71 +++++++------------------------------------ 2 files changed, 22 insertions(+), 120 deletions(-) diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 8b77700..ad64188 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -16,21 +16,15 @@ public function name(): string public function rules(): array { return [ + '@PER-CS2.0' => true, + '@PER-CS2.0:risky' => true, '@PHP81Migration' => true, - // '@PHP80Migration:risky' => true, - '@PSR12' => true, - '@PSR12:risky' => true, 'AdamWojs/phpdoc_force_fqcn_fixer' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], 'array_indentation' => true, 'array_syntax' => ['syntax' => 'short'], - 'binary_operator_spaces' => [ - 'default' => 'single_space', - 'operators' => ['=>' => null], - ], - 'blank_line_after_namespace' => true, 'blank_line_before_statement' => [ 'statements' => [ 'break', @@ -57,10 +51,6 @@ public function rules(): array 'yield', ], ], - 'braces' => [ - 'allow_single_line_anonymous_class_with_empty_body' => true, - 'allow_single_line_closure' => true, - ], 'cast_spaces' => true, 'class_attributes_separation' => [ 'elements' => [ @@ -70,53 +60,34 @@ public function rules(): array 'trait_import' => 'none', ], ], - 'class_definition' => [ - 'multi_line_extends_each_single_line' => true, - 'single_item_single_line' => true, - 'single_line' => true, - ], 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, - 'compact_nullable_typehint' => true, - 'concat_space' => ['spacing' => 'one'], - 'constant_case' => ['case' => 'lower'], - 'declare_equal_normalize' => true, + 'declare_parentheses' => true, 'dir_constant' => false, 'echo_tag_syntax' => true, - 'elseif' => true, 'empty_loop_body' => ['style' => 'braces'], - 'encoding' => true, 'escape_implicit_backslashes' => true, 'explicit_indirect_variable' => true, 'explicit_string_variable' => true, 'final_internal_class' => true, 'fopen_flag_order' => true, 'fopen_flags' => true, - 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, - 'function_declaration' => true, 'function_to_constant' => true, - 'function_typehint_space' => true, 'general_phpdoc_tag_rename' => true, 'heredoc_indentation' => true, 'heredoc_to_nowdoc' => true, 'implode_call' => true, 'include' => true, 'increment_style' => ['style' => 'post'], - 'indentation_type' => true, 'integer_literal_case' => true, 'lambda_not_used_import' => true, 'linebreak_after_opening_tag' => true, - 'line_ending' => true, 'list_syntax' => ['syntax' => 'short'], - 'lowercase_cast' => true, - 'lowercase_keywords' => true, - 'lowercase_static_reference' => true, 'magic_constant_casing' => true, 'magic_method_casing' => true, 'mb_str_functions' => true, - 'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'], 'method_chaining_indentation' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, @@ -125,14 +96,12 @@ public function rules(): array ], 'native_function_casing' => true, 'native_function_invocation' => false, - 'native_function_type_declaration_casing' => true, + 'native_type_declaration_casing' => true, '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_closing_tag' => true, 'no_empty_comment' => true, 'no_empty_phpdoc' => true, 'no_empty_statement' => true, @@ -153,7 +122,6 @@ public function rules(): array ], ], 'no_homoglyph_names' => true, - 'no_leading_import_slash' => true, 'no_leading_namespace_whitespace' => true, 'no_mixed_echo_print' => true, 'no_multiline_whitespace_around_double_arrow' => true, @@ -161,17 +129,11 @@ public function rules(): array 'no_php4_constructor' => true, 'no_short_bool_cast' => true, 'no_singleline_whitespace_before_semicolons' => true, - 'no_space_around_double_colon' => true, - 'no_spaces_after_function_name' => true, 'no_spaces_around_offset' => true, - 'no_spaces_inside_parenthesis' => true, 'no_superfluous_elseif' => true, - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_whitespace' => true, - 'no_trailing_whitespace_in_comment' => true, + 'no_trailing_comma_in_singleline' => true, + 'no_unneeded_braces' => 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, @@ -179,7 +141,6 @@ public function rules(): array 'no_useless_else' => true, 'no_useless_return' => true, 'no_whitespace_before_comma_in_array' => true, - 'no_whitespace_in_blank_line' => true, 'non_printable_character' => ['use_escape_sequences_in_strings' => true], 'normalize_index_brace' => true, 'not_operator_with_successor_space' => true, @@ -205,7 +166,6 @@ public function rules(): array 'method_private', ], ], - 'ordered_imports' => ['sort_algorithm' => 'alpha'], 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], 'phpdoc_align' => ['align' => 'left'], 'phpdoc_indent' => true, @@ -213,46 +173,37 @@ public function rules(): array 'phpdoc_no_access' => true, 'phpdoc_no_package' => true, 'phpdoc_no_useless_inheritdoc' => true, - 'phpdoc_order' => true, 'phpdoc_order_by_value' => true, + 'phpdoc_order' => true, 'phpdoc_return_self_reference' => true, 'phpdoc_scalar' => true, 'phpdoc_separation' => true, 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => false, - 'phpdoc_to_comment' => false, 'phpdoc_tag_type' => true, - 'phpdoc_trim' => true, + 'phpdoc_to_comment' => false, 'phpdoc_trim_consecutive_blank_line_separation' => true, - 'phpdoc_types' => true, + 'phpdoc_trim' => true, 'phpdoc_types_order' => true, + 'phpdoc_types' => true, 'phpdoc_var_annotation_correct_order' => true, 'phpdoc_var_without_name' => true, 'pow_to_exponentiation' => true, 'protected_to_private' => true, 'psr_autoloading' => true, 'random_api_migration' => true, - 'return_type_declaration' => ['space_before' => 'none'], 'self_accessor' => true, 'semicolon_after_instruction' => true, - 'short_scalar_cast' => true, '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_comment_style' => true, - 'single_line_after_imports' => true, 'single_quote' => true, 'space_after_semicolon' => true, 'standardize_not_equals' => true, - 'switch_case_semicolon_to_colon' => true, - 'switch_case_space' => true, - 'ternary_operator_spaces' => true, 'ternary_to_null_coalescing' => true, 'trailing_comma_in_multiline' => true, 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, + 'type_declaration_spaces' => true, 'whitespace_after_comma_in_array' => true, ]; } diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 2596163..79c2be9 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -16,21 +16,15 @@ public function name(): string public function rules(): array { return [ + '@PER-CS2.0' => true, + '@PER-CS2.0:risky' => true, '@PHP82Migration' => true, - // '@PHP82Migration:risky' => true, - '@PSR12' => true, - '@PSR12:risky' => true, 'AdamWojs/phpdoc_force_fqcn_fixer' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], 'array_indentation' => true, 'array_syntax' => ['syntax' => 'short'], - 'binary_operator_spaces' => [ - 'default' => 'single_space', - 'operators' => ['=>' => null], - ], - 'blank_line_after_namespace' => true, 'blank_line_before_statement' => [ 'statements' => [ 'break', @@ -57,10 +51,6 @@ public function rules(): array 'yield', ], ], - 'braces' => [ - 'allow_single_line_anonymous_class_with_empty_body' => true, - 'allow_single_line_closure' => true, - ], 'cast_spaces' => true, 'class_attributes_separation' => [ 'elements' => [ @@ -70,53 +60,34 @@ public function rules(): array 'trait_import' => 'none', ], ], - 'class_definition' => [ - 'multi_line_extends_each_single_line' => true, - 'single_item_single_line' => true, - 'single_line' => true, - ], 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, - 'compact_nullable_typehint' => true, - 'concat_space' => ['spacing' => 'one'], - 'constant_case' => ['case' => 'lower'], - 'declare_equal_normalize' => true, + 'declare_parentheses' => true, 'dir_constant' => false, 'echo_tag_syntax' => true, - 'elseif' => true, 'empty_loop_body' => ['style' => 'braces'], - 'encoding' => true, 'escape_implicit_backslashes' => true, 'explicit_indirect_variable' => true, 'explicit_string_variable' => true, 'final_internal_class' => true, 'fopen_flag_order' => true, 'fopen_flags' => true, - 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, - 'function_declaration' => true, 'function_to_constant' => true, - 'function_typehint_space' => true, 'general_phpdoc_tag_rename' => true, 'heredoc_indentation' => true, 'heredoc_to_nowdoc' => true, 'implode_call' => true, 'include' => true, 'increment_style' => ['style' => 'post'], - 'indentation_type' => true, 'integer_literal_case' => true, 'lambda_not_used_import' => true, 'linebreak_after_opening_tag' => true, - 'line_ending' => true, 'list_syntax' => ['syntax' => 'short'], - 'lowercase_cast' => true, - 'lowercase_keywords' => true, - 'lowercase_static_reference' => true, 'magic_constant_casing' => true, 'magic_method_casing' => true, 'mb_str_functions' => true, - 'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'], 'method_chaining_indentation' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, @@ -125,14 +96,12 @@ public function rules(): array ], 'native_function_casing' => true, 'native_function_invocation' => false, - 'native_function_type_declaration_casing' => true, + 'native_type_declaration_casing' => true, '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_closing_tag' => true, 'no_empty_comment' => true, 'no_empty_phpdoc' => true, 'no_empty_statement' => true, @@ -153,7 +122,6 @@ public function rules(): array ], ], 'no_homoglyph_names' => true, - 'no_leading_import_slash' => true, 'no_leading_namespace_whitespace' => true, 'no_mixed_echo_print' => true, 'no_multiline_whitespace_around_double_arrow' => true, @@ -161,17 +129,11 @@ public function rules(): array 'no_php4_constructor' => true, 'no_short_bool_cast' => true, 'no_singleline_whitespace_before_semicolons' => true, - 'no_space_around_double_colon' => true, - 'no_spaces_after_function_name' => true, 'no_spaces_around_offset' => true, - 'no_spaces_inside_parenthesis' => true, 'no_superfluous_elseif' => true, - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_whitespace' => true, - 'no_trailing_whitespace_in_comment' => true, + 'no_trailing_comma_in_singleline' => true, + 'no_unneeded_braces' => 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, @@ -179,7 +141,6 @@ public function rules(): array 'no_useless_else' => true, 'no_useless_return' => true, 'no_whitespace_before_comma_in_array' => true, - 'no_whitespace_in_blank_line' => true, 'non_printable_character' => ['use_escape_sequences_in_strings' => true], 'normalize_index_brace' => true, 'not_operator_with_successor_space' => true, @@ -205,7 +166,6 @@ public function rules(): array 'method_private', ], ], - 'ordered_imports' => ['sort_algorithm' => 'alpha'], 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], 'phpdoc_align' => ['align' => 'left'], 'phpdoc_indent' => true, @@ -213,46 +173,37 @@ public function rules(): array 'phpdoc_no_access' => true, 'phpdoc_no_package' => true, 'phpdoc_no_useless_inheritdoc' => true, - 'phpdoc_order' => true, 'phpdoc_order_by_value' => true, + 'phpdoc_order' => true, 'phpdoc_return_self_reference' => true, 'phpdoc_scalar' => true, 'phpdoc_separation' => true, 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => false, - 'phpdoc_to_comment' => false, 'phpdoc_tag_type' => true, - 'phpdoc_trim' => true, + 'phpdoc_to_comment' => false, 'phpdoc_trim_consecutive_blank_line_separation' => true, - 'phpdoc_types' => true, + 'phpdoc_trim' => true, 'phpdoc_types_order' => true, + 'phpdoc_types' => true, 'phpdoc_var_annotation_correct_order' => true, 'phpdoc_var_without_name' => true, 'pow_to_exponentiation' => true, 'protected_to_private' => true, 'psr_autoloading' => true, 'random_api_migration' => true, - 'return_type_declaration' => ['space_before' => 'none'], 'self_accessor' => true, 'semicolon_after_instruction' => true, - 'short_scalar_cast' => true, '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_comment_style' => true, - 'single_line_after_imports' => true, 'single_quote' => true, 'space_after_semicolon' => true, 'standardize_not_equals' => true, - 'switch_case_semicolon_to_colon' => true, - 'switch_case_space' => true, - 'ternary_operator_spaces' => true, 'ternary_to_null_coalescing' => true, 'trailing_comma_in_multiline' => true, 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, + 'type_declaration_spaces' => true, 'whitespace_after_comma_in_array' => true, ]; }