diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php deleted file mode 100644 index cb660f8..0000000 --- a/.php-cs-fixer.php +++ /dev/null @@ -1,165 +0,0 @@ -notPath('vendor') - ->notPath('build') - ->in(__DIR__) - ->name('*.php') - ->ignoreDotFiles(true) - ->ignoreVCS(true); - -return (new PhpCsFixer\Config()) - ->setFinder($finder) - ->setRiskyAllowed(true) - ->setLineEnding("\n") - ->setRules([ - '@PSR1' => true, - '@PSR2' => true, - '@PSR12' => true, - 'align_multiline_comment' => true, - 'array_indentation' => true, - 'backtick_to_shell_exec' => true, - 'blank_line_after_opening_tag' => true, - 'blank_line_before_statement' => true, - 'cast_spaces' => true, - 'combine_consecutive_issets' => true, - 'combine_consecutive_unsets' => true, - 'combine_nested_dirname' => true, - 'comment_to_phpdoc' => true, - 'compact_nullable_typehint' => true, - 'declare_equal_normalize' => true, - 'dir_constant' => true, - 'explicit_indirect_variable' => true, - 'explicit_string_variable' => true, - 'fully_qualified_strict_types' => true, - 'function_to_constant' => true, - 'function_typehint_space' => true, - 'single_line_comment_style' => [ - 'comment_types' => ['hash'], - ], - 'heredoc_to_nowdoc' => true, - 'implode_call' => true, - 'include' => true, - 'linebreak_after_opening_tag' => true, - 'list_syntax' => ['syntax' => 'short'], - 'logical_operators' => true, - 'lowercase_cast' => true, - 'constant_case' => ['case' => 'lower'], - 'lowercase_static_reference' => true, - 'magic_constant_casing' => true, - 'magic_method_casing' => true, - 'method_chaining_indentation' => true, - 'modernize_types_casting' => true, - 'multiline_comment_opening_closing' => true, - 'multiline_whitespace_before_semicolons' => true, - 'native_function_casing' => true, - 'no_alias_functions' => true, - 'no_alternative_syntax' => true, - 'no_binary_string' => true, - 'no_blank_lines_after_phpdoc' => true, - 'no_empty_phpdoc' => true, - 'no_empty_statement' => true, - 'no_leading_import_slash' => true, - 'no_leading_namespace_whitespace' => true, - 'no_mixed_echo_print' => true, - 'no_multiline_whitespace_around_double_arrow' => true, - 'no_null_property_initialization' => true, - 'no_php4_constructor' => true, - 'no_short_bool_cast' => true, - 'echo_tag_syntax' => ['format' => 'long'], - 'no_singleline_whitespace_before_semicolons' => true, - 'no_spaces_around_offset' => true, - 'no_trailing_comma_in_singleline' => true, - 'no_unneeded_control_parentheses' => true, - 'no_unneeded_curly_braces' => true, - 'no_unneeded_final_method' => true, - 'no_unreachable_default_argument_value' => true, - 'no_unused_imports' => true, - 'no_useless_else' => true, - 'no_useless_return' => 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, - 'ordered_class_elements' => true, - 'ordered_imports' => true, - 'ordered_interfaces' => true, - 'php_unit_construct' => true, - 'php_unit_dedicate_assert' => true, - 'php_unit_dedicate_assert_internal_type' => true, - 'php_unit_expectation' => true, - 'php_unit_method_casing' => ['case' => 'snake_case'], - 'phpdoc_indent' => true, - 'phpdoc_no_access' => true, - 'phpdoc_no_alias_tag' => true, - 'phpdoc_no_package' => true, - 'phpdoc_order' => true, - 'phpdoc_scalar' => true, - 'phpdoc_trim' => true, - 'phpdoc_types' => true, - 'phpdoc_var_without_name' => true, - 'phpdoc_summary' => true, - 'phpdoc_trim_consecutive_blank_line_separation' => true, - 'pow_to_exponentiation' => 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' => true, - 'single_blank_line_before_namespace' => true, - 'single_quote' => true, - 'space_after_semicolon' => true, - 'standardize_increment' => true, - 'standardize_not_equals' => true, - 'string_line_ending' => true, - 'ternary_operator_spaces' => true, - 'ternary_to_null_coalescing' => true, - 'trailing_comma_in_multiline' => [ - 'elements' => ['arrays'], - ], - 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, - 'whitespace_after_comma_in_array' => true, - 'native_function_type_declaration_casing' => true, - 'no_closing_tag' => true, - 'no_spaces_inside_parenthesis' => true, - 'no_spaces_after_function_name' => true, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], - 'single_line_after_imports' => true, - 'single_import_per_statement' => true, - 'switch_case_semicolon_to_colon' => true, - 'switch_case_space' => true, - 'binary_operator_spaces' => [ - 'default' => 'single_space', - 'operators' => ['=>' => null], - ], - 'array_syntax' => ['syntax' => 'short'], - 'class_attributes_separation' => [ - 'elements' => ['method' => 'one'], - ], - 'concat_space' => [ - 'spacing' => 'one', - ], - 'general_phpdoc_annotation_remove' => [ - 'annotations' => ['author'], - ], - 'increment_style' => [ - 'style' => 'post', - ], - 'no_extra_blank_lines' => [ - 'tokens' => [ - 'break', - 'continue', - 'throw', - 'use', - ], - ], - ]); diff --git a/composer.json b/composer.json index f578b70..ee470be 100644 --- a/composer.json +++ b/composer.json @@ -22,13 +22,13 @@ } ], "require": { - "php": "^8.1|^8.2", + "php": "^8.2", "spatie/laravel-csp": "^2.8", "spatie/laravel-package-tools": "^1.0" }, "require-dev": { "orchestra/testbench": "^8.0", - "friendsofphp/php-cs-fixer": "^3.0" + "laravel/pint": "^1.16" }, "autoload": { "psr-4": { @@ -37,6 +37,7 @@ }, "scripts": { "analyse": "vendor/bin/phpstan analyse", + "fix": "vendor/bin/pint", "test": "vendor/bin/phpunit", "test-coverage": "vendor/bin/phpunit --coverage-html ../../temp/coverage", "post-autoload-dump": [ diff --git a/pint.json b/pint.json new file mode 100644 index 0000000..c4df37d --- /dev/null +++ b/pint.json @@ -0,0 +1,175 @@ +{ + "preset": "laravel", + "rules": { + "@PSR1": true, + "@PSR2": true, + "@PSR12": true, + "align_multiline_comment": true, + "array_indentation": true, + "backtick_to_shell_exec": true, + "blank_line_after_opening_tag": true, + "blank_line_before_statement": true, + "cast_spaces": true, + "combine_consecutive_issets": true, + "combine_consecutive_unsets": true, + "combine_nested_dirname": true, + "comment_to_phpdoc": true, + "compact_nullable_typehint": true, + "declare_equal_normalize": true, + "dir_constant": true, + "explicit_indirect_variable": true, + "explicit_string_variable": true, + "fully_qualified_strict_types": true, + "function_to_constant": true, + "function_typehint_space": true, + "single_line_comment_style": { + "comment_types": [ + "hash" + ] + }, + "heredoc_to_nowdoc": true, + "implode_call": true, + "include": true, + "linebreak_after_opening_tag": true, + "list_syntax": { + "syntax": "short" + }, + "logical_operators": true, + "lowercase_cast": true, + "constant_case": { + "case": "lower" + }, + "lowercase_static_reference": true, + "magic_constant_casing": true, + "magic_method_casing": true, + "method_chaining_indentation": true, + "modernize_types_casting": true, + "multiline_comment_opening_closing": true, + "multiline_whitespace_before_semicolons": true, + "native_function_casing": true, + "no_alias_functions": true, + "no_alternative_syntax": true, + "no_binary_string": true, + "no_blank_lines_after_phpdoc": true, + "no_empty_phpdoc": true, + "no_empty_statement": true, + "no_leading_import_slash": true, + "no_leading_namespace_whitespace": true, + "no_mixed_echo_print": true, + "no_multiline_whitespace_around_double_arrow": true, + "no_null_property_initialization": true, + "no_php4_constructor": true, + "no_short_bool_cast": true, + "echo_tag_syntax": { + "format": "long" + }, + "no_singleline_whitespace_before_semicolons": true, + "no_spaces_around_offset": true, + "no_trailing_comma_in_singleline": true, + "no_unneeded_control_parentheses": true, + "no_unneeded_curly_braces": true, + "no_unneeded_final_method": true, + "no_unreachable_default_argument_value": true, + "no_unused_imports": true, + "no_useless_else": true, + "no_useless_return": true, + "no_whitespace_before_comma_in_array": true, + "no_whitespace_in_blank_line": true, + "not_operator_with_space": false, + "not_operator_with_successor_space": false, + "non_printable_character": true, + "normalize_index_brace": true, + "object_operator_without_whitespace": true, + "ordered_class_elements": true, + "ordered_imports": true, + "ordered_interfaces": true, + "php_unit_construct": true, + "php_unit_dedicate_assert": true, + "php_unit_dedicate_assert_internal_type": true, + "php_unit_expectation": true, + "php_unit_method_casing": { + "case": "snake_case" + }, + "phpdoc_indent": true, + "phpdoc_no_access": true, + "phpdoc_no_alias_tag": true, + "phpdoc_no_package": true, + "phpdoc_order": true, + "phpdoc_scalar": true, + "phpdoc_trim": true, + "phpdoc_types": true, + "phpdoc_var_without_name": true, + "phpdoc_summary": true, + "phpdoc_trim_consecutive_blank_line_separation": true, + "pow_to_exponentiation": 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": true, + "single_quote": true, + "space_after_semicolon": true, + "standardize_increment": true, + "standardize_not_equals": true, + "string_line_ending": true, + "ternary_operator_spaces": true, + "ternary_to_null_coalescing": true, + "trailing_comma_in_multiline": { + "elements": [ + "arrays" + ] + }, + "trim_array_spaces": true, + "unary_operator_spaces": true, + "whitespace_after_comma_in_array": true, + "native_function_type_declaration_casing": true, + "no_closing_tag": true, + "no_spaces_inside_parenthesis": true, + "no_spaces_after_function_name": true, + "nullable_type_declaration_for_default_null_value": { + "use_nullable_type_declaration": true + }, + "single_line_after_imports": true, + "single_import_per_statement": true, + "switch_case_semicolon_to_colon": true, + "switch_case_space": true, + "binary_operator_spaces": { + "default": "single_space", + "operators": { + "=>": null + } + }, + "array_syntax": { + "syntax": "short" + }, + "class_attributes_separation": { + "elements": { + "method": "one" + } + }, + "concat_space": { + "spacing": "one" + }, + "general_phpdoc_annotation_remove": { + "annotations": [ + "author" + ] + }, + "increment_style": { + "style": "post" + }, + "no_extra_blank_lines": { + "tokens": [ + "break", + "continue", + "throw", + "use" + ] + } + } +} \ No newline at end of file