-
Notifications
You must be signed in to change notification settings - Fork 125
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Setup php-cs-fixer, refs #13317 #1249
Conversation
080b7b2
to
db539b8
Compare
db539b8
to
39e48a4
Compare
957bc4f
to
2ae7c99
Compare
plugins/sfEadPlugin/modules/sfEadPlugin/templates/indexSuccessBody.xml.php
Outdated
Show resolved
Hide resolved
10772a7
to
70e700c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow, looks great @jraddaoui! 👏 👏 👏
I only had one requested change about the PHP Unit @covers
annotations.
plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/taskComponent.class.php
Show resolved
Hide resolved
Thanks @djjuhasz, done! I'd appreciate your feedback too in the wiki changes I added to the proposal doc. |
c34527d
to
6c6beed
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great job @jraddaoui!
Format PHP code using PHP CS Fixer and the @PhpCsFixer ruleset with one exception to avoid inconsitencies in templates (check .php_cs). Setup Github Actions workflow to run syntax checks in the CI process. Squashed commit of the following: commit 6c6beed Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Wed Mar 24 12:56:09 2021 +0100 Reformat after rebase commit c8ede87 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Tue Mar 23 07:44:38 2021 +0100 Add @Covers annotation to phpunit tests commit 4bf78b9 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Mar 22 20:57:30 2021 +0100 Use composer install in GA workflow commit 070f9b2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Mar 22 08:46:56 2021 +0100 Update composer dependencies commit c8ea504 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Fri Mar 19 14:47:01 2021 +0100 Format generated config.php on Docker commit ab8c832 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Fri Mar 19 14:44:14 2021 +0100 Fix indentation issues In the change from two to fours spaces indentation, the following cases were not considered: - `switch` blocks. - Multiline control statements. - Multiline assignments/returns. - Multiline strings. - Semicolon after method chain calls. - Indentation after inline comments. Also, normalize multiline array's final bracket in new line to reduce diffs, except in templates. commit bbcf8d3 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Wed Mar 17 04:56:32 2021 +0100 Fix single line ifs and other template tweaks Single line ifs got braces added and indentation got broken. Use ternary operator or PHP tags on each line. Other minor fixes. commit 741b64c Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sun Mar 14 04:35:21 2021 +0100 Remove switch statement from template commit 171fee6 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Tue Mar 16 21:36:51 2021 +0100 Remove broken and mostly unneded template comments commit 2d9183b Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Tue Mar 16 22:05:38 2021 +0100 Update php-cs-fixer configuration commit 7b504dd Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Wed Mar 17 05:10:15 2021 +0100 indentation commit 63bcf90 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Tue Mar 16 21:21:37 2021 +0100 braces ['allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => true] commit c53763e Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sun Mar 14 00:13:38 2021 +0100 simple_to_complex_string_variable commit a0b0264 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sun Mar 14 00:10:31 2021 +0100 return_assignment commit c912975 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sun Mar 14 00:03:39 2021 +0100 phpdoc_order commit 0da40d3 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sun Mar 14 00:01:41 2021 +0100 phpdoc_no_empty_return commit 9d99f56 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 23:58:41 2021 +0100 phpdoc_add_missing_param_annotation commit 8fdaebe Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:36:13 2021 +0100 php_unit_test_class_requires_covers commit d9b7e3a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:33:58 2021 +0100 php_unit_internal_class commit ea9b017 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:32:38 2021 +0100 operator_linebreak ['only_booleans' => true] commit d7a552e Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:30:02 2021 +0100 no_useless_return commit ae926f2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:27:58 2021 +0100 no_useless_else commit ff9525c Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:22:15 2021 +0100 no_superfluous_elseif commit 9981441 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:20:10 2021 +0100 no_null_property_initialization commit 494ac6b Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:18:39 2021 +0100 multiline_whitespace_before_semicolons commit 99b6371 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:16:29 2021 +0100 multiline_comment_opening_closing commit 5ffc9c6 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:14:14 2021 +0100 method_chaining_indentation commit 6da8523 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:12:20 2021 +0100 heredoc_to_nowdoc commit f6f6bfc Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:10:12 2021 +0100 explicit_string_variable commit cf8a994 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:07:49 2021 +0100 explicit_indirect_variable commit 756a357 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:06:10 2021 +0100 escape_implicit_backslashes commit a5428fd Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:03:16 2021 +0100 combine_consecutive_unsets commit cda4a47 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 22:01:36 2021 +0100 combine_consecutive_issets commit 45835e2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 21:59:52 2021 +0100 array_indentation commit f87eecb Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 21:01:50 2021 +0100 yoda_style commit 80d79c7 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:52:01 2021 +0100 whitespace_after_comma_in_array commit 36875df Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:50:20 2021 +0100 unary_operator_spaces commit ce0e991 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:48:17 2021 +0100 trim_array_spaces commit 4d1904a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:45:34 2021 +0100 trailing_comma_in_multiline_array commit e2c4106 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:42:30 2021 +0100 switch_continue_to_break commit 6b72c4a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:40:14 2021 +0100 standardize_increment commit 6666392 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:38:57 2021 +0100 space_after_semicolon ['remove_in_empty_for_expressions' => true] commit 7c89a36 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:35:25 2021 +0100 single_space_after_construct ['constructs' => ['abstract', 'as', 'attribute', 'break', 'case', 'catch', 'class', 'clone', 'comment', 'const', 'const_import', 'continue', 'echo', 'elseif', 'extends', 'final', 'finally', 'for', 'foreach', 'function', 'function_import', 'global', 'goto', 'if', 'implements', 'include', 'include_once', 'instanceof', 'insteadof', 'interface', 'match', 'named_argument', 'new', 'open_tag_with_echo', 'php_doc', 'php_open', 'print', 'private', 'protected', 'public', 'require', 'require_once', 'return', 'static', 'throw', 'trait', 'use', 'use_lambda', 'use_trait', 'var', 'while', 'yield', 'yield_from']] commit 53f52cd Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:11:58 2021 +0100 single_quote commit d40f1b7 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:06:46 2021 +0100 single_line_comment_style commit be8aa48 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 20:02:02 2021 +0100 semicolon_after_instruction commit 9488181 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:57:21 2021 +0100 phpdoc_types_order commit 110c678 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:55:49 2021 +0100 phpdoc_types commit 7b0a4db Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:54:10 2021 +0100 phpdoc_trim_consecutive_blank_line_separation commit 44d9849 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:52:50 2021 +0100 phpdoc_trim commit 8aa55cc Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:51:50 2021 +0100 phpdoc_to_comment commit 9693b6e Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:49:55 2021 +0100 phpdoc_summary commit 1ec5795 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:46:15 2021 +0100 phpdoc_separation commit 3de7dd5 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:44:49 2021 +0100 phpdoc_scalar commit b202b1b Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:42:09 2021 +0100 phpdoc_no_package commit 9a0875a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:41:19 2021 +0100 phpdoc_no_alias_tag commit bc1ed87 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:37:50 2021 +0100 phpdoc_no_access commit 46c2f55 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:35:10 2021 +0100 phpdoc_indent commit 191ecec Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:33:35 2021 +0100 phpdoc_annotation_without_dot commit 91e7299 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:32:23 2021 +0100 phpdoc_align ['tags' => ['method', 'param', 'property', 'return', 'throws', 'type', 'var']] commit c3d2cfa Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:27:21 2021 +0100 no_whitespace_before_comma_in_array commit 09a9f2f Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:22:14 2021 +0100 no_unneeded_control_parentheses ['statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield', 'yield_from']] commit 4a9c2ba Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:18:56 2021 +0100 no_trailing_comma_in_singleline_array commit 7949e2b Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:14:19 2021 +0100 no_singleline_whitespace_before_semicolons commit c70cd0a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 19:11:45 2021 +0100 no_multiline_whitespace_around_double_arrow commit e1d80ff Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:58:44 2021 +0100 no_mixed_echo_print commit a109e73 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:52:09 2021 +0100 no_extra_blank_lines ['tokens' => ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use', 'use_trait']] commit b12a13c Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:48:52 2021 +0100 no_empty_statement commit 1e6464a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:46:57 2021 +0100 no_empty_comment commit 84c827a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:45:01 2021 +0100 no_blank_lines_after_phpdoc commit 63a2844 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:43:26 2021 +0100 no_alternative_syntax commit a813b0d Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:40:54 2021 +0100 no_alias_language_construct_call commit 0949911 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:39:47 2021 +0100 native_function_type_declaration_casing commit 24f6b15 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:38:52 2021 +0100 native_function_casing commit 736337e Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:35:12 2021 +0100 increment_style commit 6971254 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:25:59 2021 +0100 include commit 969cd10 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:22:02 2021 +0100 fully_qualified_strict_types commit 4f056e0 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:19:55 2021 +0100 concat_space commit 854d6e1 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:16:33 2021 +0100 class_attributes_separation ['elements' => ['method' => 'one']] commit 23869ff Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:14:07 2021 +0100 cast_spaces commit 2801dd1 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:12:27 2021 +0100 blank_line_before_statement ['statements' => ['break', 'case', 'continue', 'declare', 'default', 'exit', 'goto', 'include', 'include_once', 'require', 'require_once', 'return', 'switch', 'throw', 'try']] commit eb6eefa Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:09:45 2021 +0100 binary_operator_spaces commit 929be13 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 18:06:15 2021 +0100 array_syntax ['syntax' => 'short'] commit 6909f09 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:59:21 2021 +0100 ternary_operator_spaces commit b0b7578 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:56:23 2021 +0100 short_scalar_cast commit 1f65198 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:53:56 2021 +0100 return_type_declaration commit f3e34d2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:50:55 2021 +0100 ordered_class_elements commit e2d6308 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:48:26 2021 +0100 no_whitespace_in_blank_line commit 862c37d Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:35:22 2021 +0100 no_blank_lines_after_class_opening commit 225f6e1 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:22:22 2021 +0100 new_with_braces commit 863ff54 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:18:18 2021 +0100 blank_line_after_opening_tag commit 721d5a9 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:12:34 2021 +0100 visibility_required ['elements' => ['const', 'method', 'property']] commit 282616f Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:06:41 2021 +0100 switch_case_semicolon_to_colon commit feaec22 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:03:45 2021 +0100 single_class_element_per_statement commit 2e5b49d Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 17:00:36 2021 +0100 single_blank_line_at_eof commit e135583 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:59:28 2021 +0100 no_trailing_whitespace_in_comment commit 1b64e90 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:57:32 2021 +0100 no_trailing_whitespace commit 8e44926 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:56:23 2021 +0100 no_spaces_inside_parenthesis commit 499dae2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:54:55 2021 +0100 no_spaces_after_function_name commit 9645eb6 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:53:37 2021 +0100 no_closing_tag commit 645a0ec Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:50:44 2021 +0100 no_break_comment commit 5b546a0 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:48:42 2021 +0100 method_argument_space commit d8b45d3 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:32:48 2021 +0100 lowercase_keywords commit d1f5ba2 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:31:13 2021 +0100 line_ending commit 15004d5 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:28:56 2021 +0100 indentation_type commit 27e5bba Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:24:23 2021 +0100 function_declaration commit 199ee9a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:21:55 2021 +0100 elseif commit 55e8b4d Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:20:41 2021 +0100 constant_case commit eeca8b9 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Sat Mar 13 16:15:47 2021 +0100 class_definition ['single_line' => true] commit 5af4b19 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Tue Mar 9 01:31:14 2021 +0100 WIP: Setup php-cs-fixer, refs #13317
6c6beed
to
85c0ba6
Compare
Format PHP code using PHP CS Fixer and the @PhpCsFixer ruleset with
one exception to avoid inconsitencies in templates (check
.php_cs
).Setup Github Actions workflow to run syntax checks in the CI process.