From 74ee1533575e9b8e4e5f460f27f71f285c1aef4b Mon Sep 17 00:00:00 2001 From: Claudio Dekker Date: Wed, 8 Dec 2021 18:00:56 +0100 Subject: [PATCH] Minor tweaks --- .gitignore | 2 + .php-cs-fixer.dist.php | 190 +++++++++++++++++++++ .php_cs.dist | 23 --- resources/js/Pages/Contacts/Index.vue | 2 +- resources/js/Pages/Organizations/Index.vue | 2 +- resources/js/Pages/Users/Index.vue | 2 +- resources/js/Shared/Layout.vue | 2 +- 7 files changed, 196 insertions(+), 27 deletions(-) create mode 100644 .php-cs-fixer.dist.php delete mode 100644 .php_cs.dist diff --git a/.gitignore b/.gitignore index c0acb11..a210a04 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ .env .env.backup .phpunit.result.cache +.php-cs-fixer.php +.php-cs-fixer.cache docker-compose.override.yml Homestead.json Homestead.yaml diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php new file mode 100644 index 0000000..c2355be --- /dev/null +++ b/.php-cs-fixer.dist.php @@ -0,0 +1,190 @@ +notPath('bootstrap') + ->notPath('node_modules') + ->notPath('storage') + ->notPath('vendor') + ->in(__DIR__) + ->name('*.php') + ->notName('*.blade.php'); + +return (new PhpCsFixer\Config()) + ->setRiskyAllowed(true) + ->setRules([ + '@PSR2' => true, + 'align_multiline_comment' => [ + 'comment_type' => 'phpdocs_like', + ], + 'array_indentation' => true, + 'array_syntax' => [ + 'syntax' => 'short', + ], + 'binary_operator_spaces' => [ + 'operators' => [ + '=>' => null, + '=' => 'single_space', + ], + ], + 'blank_line_after_namespace' => true, + 'blank_line_after_opening_tag' => true, + 'blank_line_before_statement' => [ + 'statements' => [ + 'return', + ], + ], + 'braces' => false, + 'cast_spaces' => true, + 'class_attributes_separation' => [ + 'elements' => [ + 'method' => 'one', + ], + ], + 'class_definition' => false, + 'clean_namespace' => true, + 'compact_nullable_typehint' => true, + 'concat_space' => [ + 'spacing' => 'none', + ], + 'constant_case' => [ + 'case' => 'lower', + ], + 'declare_equal_normalize' => true, + 'elseif' => true, + 'encoding' => true, + 'full_opening_tag' => true, + 'function_declaration' => true, + 'function_typehint_space' => true, + 'heredoc_to_nowdoc' => true, + 'include' => true, + 'increment_style' => [ + 'style' => 'post', + ], + 'indentation_type' => true, + 'integer_literal_case' => true, + 'lambda_not_used_import' => 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, + 'method_argument_space' => [ + 'on_multiline' => 'ignore', + ], + 'multiline_whitespace_before_semicolons' => true, + 'native_function_casing' => true, + 'native_function_type_declaration_casing' => 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_phpdoc' => true, + 'no_empty_statement' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'extra', + 'throw', + 'use', + ], + ], + 'no_space_around_double_colon' => true, + 'no_leading_import_slash' => true, + 'no_leading_namespace_whitespace' => true, + 'no_mixed_echo_print' => [ + 'use' => 'echo', + ], + 'no_multiline_whitespace_around_double_arrow' => true, + 'no_short_bool_cast' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_spaces_after_function_name' => true, + 'no_spaces_around_offset' => [ + 'positions' => [ + 'inside', + ], + ], + 'no_spaces_inside_parenthesis' => 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_unneeded_control_parentheses' => true, + 'no_unneeded_curly_braces' => true, + 'no_unset_cast' => true, + 'no_unused_imports' => true, + 'no_useless_return' => true, + 'no_whitespace_before_comma_in_array' => true, + 'no_whitespace_in_blank_line' => true, + 'normalize_index_brace' => true, + 'not_operator_with_successor_space' => true, + 'object_operator_without_whitespace' => true, + 'ordered_imports' => [ + 'sort_algorithm' => 'alpha', + ], + 'phpdoc_indent' => true, + 'phpdoc_inline_tag_normalizer' => true, + 'phpdoc_no_alias_tag' => [ + 'replacements' => [ + 'type' => 'var', + ], + ], + 'phpdoc_no_access' => true, + 'phpdoc_no_package' => true, + 'phpdoc_no_useless_inheritdoc' => true, + 'phpdoc_return_self_reference' => true, + 'phpdoc_scalar' => true, + 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_summary' => true, + 'phpdoc_trim' => true, + 'phpdoc_types' => true, + 'phpdoc_var_without_name' => true, + 'return_type_declaration' => [ + 'space_before' => 'none', + ], + 'short_scalar_cast' => true, + 'single_blank_line_at_eof' => true, + 'single_blank_line_before_namespace' => true, + 'single_class_element_per_statement' => true, + 'single_import_per_statement' => true, + 'single_line_after_imports' => true, + 'single_line_comment_style' => [ + 'comment_types' => [ + 'hash', + ], + ], + 'single_quote' => true, + 'space_after_semicolon' => true, + 'standardize_not_equals' => true, + 'switch_case_semicolon_to_colon' => true, + 'switch_case_space' => true, + 'switch_continue_to_break' => true, + 'ternary_operator_spaces' => true, + 'trailing_comma_in_multiline' => [ + 'elements' => [ + 'arrays', + ], + ], + 'trim_array_spaces' => true, + 'types_spaces' => [ + 'space' => 'none', + ], + 'unary_operator_spaces' => true, + 'visibility_required' => [ + 'elements' => [ + 'method', + 'property', + ], + ], + 'whitespace_after_comma_in_array' => true, + // Risky + 'no_alias_functions' => true, + 'no_unreachable_default_argument_value' => true, + 'self_accessor' => true, + 'psr_autoloading' => true, + ]) + ->setFinder($finder); diff --git a/.php_cs.dist b/.php_cs.dist deleted file mode 100644 index 0017cd7..0000000 --- a/.php_cs.dist +++ /dev/null @@ -1,23 +0,0 @@ -setUsingCache(false) - ->setRiskyAllowed(true) - ->setRules([ - '@PHP70Migration' => true, - '@PHP71Migration' => true, - '@PSR2' => true, - '@Symfony' => true, - 'array_syntax' => ['syntax' => 'short'], - 'increment_style' => ['style' => 'post'], - 'no_multiline_whitespace_before_semicolons' => true, - 'not_operator_with_successor_space' => true, - 'ordered_imports' => ['sortAlgorithm' => 'alpha'], - 'php_unit_method_casing' => ['case' => 'snake_case'], - 'semicolon_after_instruction' => false, - 'single_line_throw' => false, - 'strict_comparison' => true, - 'yoda_style' => false, - ]); diff --git a/resources/js/Pages/Contacts/Index.vue b/resources/js/Pages/Contacts/Index.vue index b3ae153..6a885d0 100644 --- a/resources/js/Pages/Contacts/Index.vue +++ b/resources/js/Pages/Contacts/Index.vue @@ -13,7 +13,7 @@ Create - +
diff --git a/resources/js/Pages/Organizations/Index.vue b/resources/js/Pages/Organizations/Index.vue index 5bceff9..f8cb232 100644 --- a/resources/js/Pages/Organizations/Index.vue +++ b/resources/js/Pages/Organizations/Index.vue @@ -13,7 +13,7 @@ Create - +
diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue index c25ead4..b1976ab 100644 --- a/resources/js/Pages/Users/Index.vue +++ b/resources/js/Pages/Users/Index.vue @@ -19,7 +19,7 @@ Create - +
diff --git a/resources/js/Shared/Layout.vue b/resources/js/Shared/Layout.vue index dfa5a8b..81c4f5d 100644 --- a/resources/js/Shared/Layout.vue +++ b/resources/js/Shared/Layout.vue @@ -26,7 +26,7 @@
{{ auth.user.first_name }} - +