From 8f482732b0f752fe3b2065571270b8f84cb6c90a Mon Sep 17 00:00:00 2001 From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Sat, 11 Jun 2022 17:08:53 +0200 Subject: [PATCH 1/5] Require at least PHP v7.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6add70f..5b523a7 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "issues": "https://github.com/jsonapiphp/jsonapi/issues" }, "require": { - "php": ">=7.1.0" + "php": ">=7.4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", From a7ac335f2d32ac72b4434f07a2d428ce48a24047 Mon Sep 17 00:00:00 2001 From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Sat, 11 Jun 2022 17:09:09 +0200 Subject: [PATCH 2/5] Require at least "phpunit/phpunit" v9.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b523a7..048d9c2 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "friendsofphp/php-cs-fixer": "^2.14", "mockery/mockery": "^1.0", "phpmd/phpmd": "^2.6", - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^9.5", "scrutinizer/ocular": "^1.4", "squizlabs/php_codesniffer": "^2.9" }, From cbd173f3569ee1840127be1e2aed214555e2c14b Mon Sep 17 00:00:00 2001 From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Sat, 11 Jun 2022 17:11:37 +0200 Subject: [PATCH 3/5] Remove "scrutinizer/ocular" dev dependency --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 048d9c2..fc6fb93 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,6 @@ "mockery/mockery": "^1.0", "phpmd/phpmd": "^2.6", "phpunit/phpunit": "^9.5", - "scrutinizer/ocular": "^1.4", "squizlabs/php_codesniffer": "^2.9" }, "minimum-stability": "stable", From 8f2f0b3bd5f8668b6e9a4e9d1f86b9449e8fca0c Mon Sep 17 00:00:00 2001 From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Sat, 11 Jun 2022 17:13:22 +0200 Subject: [PATCH 4/5] Remove ".scruntizer.yml" file --- .gitattributes | 1 - .scrutinizer.yml | 258 ----------------------------------------------- 2 files changed, 259 deletions(-) delete mode 100644 .scrutinizer.yml diff --git a/.gitattributes b/.gitattributes index 4aecf78..2279f25 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,5 +9,4 @@ /.gitattributes export-ignore /.gitignore export-ignore /.php_cs.dist export-ignore -/.scrutinizer.yml export-ignore /.travis.yml export-ignore diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 3bea075..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,258 +0,0 @@ -filter: - excluded_paths: - - 'tests/*' - - 'sample/*' - -tools: - php_sim: true - php_pdepend: true - php_analyzer: true - external_code_coverage: true - -coding_style: - php: - indentation: - general: - use_tabs: false - size: 4 - switch: - indent_case: true - spaces: - before_parentheses: - function_declaration: false - closure_definition: false - function_call: false - if: true - for: true - while: true - switch: true - catch: true - array_initializer: false - around_operators: - assignment: true - logical: true - equality: true - relational: true - bitwise: true - additive: true - multiplicative: true - shift: true - unary_additive: false - concatenation: false - negation: false - before_left_brace: - class: true - function: true - if: true - else: true - for: true - while: true - do: true - switch: true - try: true - catch: true - finally: true - before_keywords: - else: true - while: true - catch: true - finally: true - within: - brackets: false - array_initializer: false - grouping: false - function_call: false - function_declaration: false - if: false - for: false - while: false - switch: false - catch: false - type_cast: false - ternary_operator: - before_condition: true - after_condition: true - before_alternative: true - after_alternative: true - in_short_version: false - other: - before_comma: false - after_comma: true - before_semicolon: false - after_semicolon: true - after_type_cast: false - braces: - classes_functions: - class: new-line - function: new-line - closure: end-of-line - if: - opening: end-of-line - always: true - else_on_new_line: false - for: - opening: end-of-line - always: true - while: - opening: end-of-line - always: true - do_while: - opening: end-of-line - always: true - while_on_new_line: false - switch: - opening: end-of-line - try: - opening: end-of-line - catch_on_new_line: false - finally_on_new_line: false - -checks: - php: - uppercase_constants: true - code_rating: true - duplication: true - variable_existence: true - useless_calls: true - use_statement_alias_conflict: true - unused_variables: true - unused_properties: true - unused_parameters: true - unused_methods: true - unreachable_code: true - sql_injection_vulnerabilities: true - security_vulnerabilities: true - precedence_mistakes: true - precedence_in_conditions: true - parameter_non_unique: true - no_property_on_interface: true - no_non_implemented_abstract_methods: true - deprecated_code_usage: true - closure_use_not_conflicting: true - closure_use_modifiable: true - avoid_useless_overridden_methods: true - avoid_conflicting_incrementers: true - assignment_of_null_return: true - single_namespace_per_use: true - verify_property_names: true - verify_argument_usable_as_reference: true - verify_access_scope_valid: true - use_self_instead_of_fqcn: true - too_many_arguments: true - symfony_request_injection: true - switch_fallthrough_commented: true - spacing_of_function_arguments: true - spacing_around_non_conditional_operators: true - spacing_around_conditional_operators: true - simplify_boolean_return: true - side_effects_or_types: true - return_doc_comments: true - return_doc_comment_if_not_inferrable: true - require_scope_for_properties: true - require_scope_for_methods: true - require_php_tag_first: true - require_braces_around_control_structures: true - remove_trailing_whitespace: true - remove_php_closing_tag: true - remove_extra_empty_lines: true - psr2_switch_declaration: true - psr2_control_structure_declaration: true - psr2_class_declaration: true - property_assignments: true - properties_in_camelcaps: true - prefer_while_loop_over_for_loop: true - prefer_unix_line_ending: true - prefer_sapi_constant: true - phpunit_assertions: true - php5_style_constructor: true - parameters_in_camelcaps: true - parameter_doc_comments: true - param_doc_comment_if_not_inferrable: true - overriding_private_members: true - one_class_per_file: true - optional_parameters_at_the_end: true - non_commented_empty_catch_block: true - no_unnecessary_if: true - no_unnecessary_function_call_in_for_loop: true - no_unnecessary_final_modifier: true - no_underscore_prefix_in_properties: true - no_underscore_prefix_in_methods: true - no_trait_type_hints: true - no_trailing_whitespace: true - no_space_inside_cast_operator: true - no_space_before_semicolon: true - no_space_around_object_operator: true - no_space_after_cast: true - no_short_variable_names: - minimum: '3' - no_short_open_tag: true - no_mixed_inline_html: true - no_long_variable_names: - maximum: '20' - no_goto: true - no_global_keyword: true - no_exit: true - no_eval: true - no_error_suppression: true - no_empty_statements: true - no_else_if_statements: true - no_duplicate_arguments: true - no_debug_code: true - no_commented_out_code: true - newline_at_end_of_file: true - naming_conventions: - local_variable: '^[a-z][a-zA-Z0-9]*$' - abstract_class_name: ^Abstract|Factory$ - utility_class_name: 'Utils?$' - constant_name: '^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$' - property_name: '^[a-z][a-zA-Z0-9]*$' - method_name: '^(?:[a-z]|__)[a-zA-Z0-9]*$' - parameter_name: '^[a-z][a-zA-Z0-9]*$' - interface_name: '^[A-Z][a-zA-Z0-9]*Interface$' - type_name: '^[A-Z][a-zA-Z0-9]*$' - exception_name: '^[A-Z][a-zA-Z0-9]*Exception$' - isser_method_name: '^(?:is|has|should|may|supports)' - more_specific_types_in_doc_comments: true - missing_arguments: true - method_calls_on_non_object: true - lowercase_php_keywords: true - lowercase_basic_constants: true - line_length: - max_length: '1000' - instanceof_class_exists: true - function_in_camel_caps: true - foreach_usable_as_reference: true - foreach_traversable: true - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: false - order_alphabetically: false - fix_php_opening_tag: true - fix_linefeed: true - fix_identation_4spaces: true - fix_line_ending: true - fix_doc_comments: true - ensure_lower_case_builtin_functions: true - encourage_single_quotes: true - encourage_shallow_comparison: true - encourage_postdec_operator: true - deadlock_detection_in_loops: true - classes_in_camel_caps: true - catch_class_exists: true - blank_line_after_namespace_declaration: true - avoid_todo_comments: true - avoid_tab_indentation: true - avoid_superglobals: true - avoid_perl_style_comments: true - avoid_multiple_statements_on_same_line: true - avoid_length_functions_in_loops: true - avoid_fixme_comments: true - avoid_entity_manager_injection: true - avoid_duplicate_types: true - avoid_corrupting_byteorder_marks: true - avoid_closing_tag: true - avoid_aliased_php_functions: true - argument_type_checks: true - no_short_method_names: - minimum: '3' \ No newline at end of file From 3ee658161e492ecee551cac0a319d146a58817b3 Mon Sep 17 00:00:00 2001 From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com> Date: Sat, 11 Jun 2022 17:19:01 +0200 Subject: [PATCH 5/5] Update "friendsofphp/php-cs-fixer" to v3 --- .gitattributes | 2 +- .php_cs.dist => .php-cs-fixer.dist.php | 5 +++-- composer.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename .php_cs.dist => .php-cs-fixer.dist.php (80%) diff --git a/.gitattributes b/.gitattributes index 2279f25..300c4e7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,5 +8,5 @@ /.editorconfig export-ignore /.gitattributes export-ignore /.gitignore export-ignore -/.php_cs.dist export-ignore +/.php-cs-fixer.dist.php export-ignore /.travis.yml export-ignore diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php similarity index 80% rename from .php_cs.dist rename to .php-cs-fixer.dist.php index a7ce0c9..1fb6523 100644 --- a/.php_cs.dist +++ b/.php-cs-fixer.dist.php @@ -2,13 +2,14 @@ declare(strict_types=1); -return PhpCsFixer\Config::create() +return (new PhpCsFixer\Config()) ->setUsingCache(false) ->setRules([ 'native_function_invocation' => [ 'exclude' => [ '_' - ] + ], + 'include' => ['@all'], ], ]) ->setRiskyAllowed(true) diff --git a/composer.json b/composer.json index fc6fb93..645cba7 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "php": ">=7.4.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.14", + "friendsofphp/php-cs-fixer": "^3.8", "mockery/mockery": "^1.0", "phpmd/phpmd": "^2.6", "phpunit/phpunit": "^9.5",