Merge remote-tracking branch 'origin/main'

Author: Andrey Helldar

.editorconfig

@@ -507,7 +507,7 @@ ij_php_align_inline_comments = true
 ij_php_align_key_value_pairs = true
 ij_php_align_match_arm_bodies = true
 ij_php_align_multiline_array_initializer_expression = true
-ij_php_align_multiline_binary_operation = false
+ij_php_align_multiline_binary_operation = true
 ij_php_align_multiline_chained_methods = false
 ij_php_align_multiline_extends_list = true
 ij_php_align_multiline_for = false
@@ -524,7 +524,7 @@ ij_php_array_initializer_right_brace_on_new_line = true
 ij_php_array_initializer_wrap = on_every_item
 ij_php_assignment_wrap = on_every_item
 ij_php_attributes_wrap = split_into_lines
-ij_php_author_weight = 3
+ij_php_author_weight = 4
 ij_php_binary_operation_sign_on_next_line = true
 ij_php_binary_operation_wrap = on_every_item
 ij_php_blank_lines_after_class_header = 0
@@ -551,7 +551,7 @@ ij_php_category_weight = 28
 ij_php_class_brace_style = next_line
 ij_php_comma_after_last_array_element = true
 ij_php_concat_spaces = true
-ij_php_copyright_weight = 4
+ij_php_copyright_weight = 28
 ij_php_deprecated_weight = 0
 ij_php_do_while_brace_force = always
 ij_php_else_if_style = combine
@@ -580,7 +580,7 @@ ij_php_import_sorting = alphabetic
 ij_php_indent_break_from_case = true
 ij_php_indent_case_from_switch = true
 ij_php_indent_code_in_php_tags = false
-ij_php_internal_weight = 1
+ij_php_internal_weight = 28
 ij_php_keep_blank_lines_after_lbrace = 1
 ij_php_keep_blank_lines_before_right_brace = 0
 ij_php_keep_blank_lines_in_code = 1
@@ -593,10 +593,10 @@ ij_php_keep_rparen_and_lbrace_on_one_line = true
 ij_php_keep_simple_classes_in_one_line = true
 ij_php_keep_simple_methods_in_one_line = false
 ij_php_lambda_brace_style = end_of_line
-ij_php_license_weight = 5
+ij_php_license_weight = 28
 ij_php_line_comment_add_space = false
 ij_php_line_comment_at_first_column = false
-ij_php_link_weight = 7
+ij_php_link_weight = 3
 ij_php_lower_case_boolean_const = true
 ij_php_lower_case_keywords = true
 ij_php_lower_case_null_const = true
@@ -605,14 +605,14 @@ ij_php_method_call_chain_wrap = on_every_item
 ij_php_method_parameters_new_line_after_left_paren = true
 ij_php_method_parameters_right_paren_on_new_line = true
 ij_php_method_parameters_wrap = on_every_item
-ij_php_method_weight = 13
+ij_php_method_weight = 10
 ij_php_modifier_list_wrap = false
 ij_php_multiline_chained_calls_semicolon_on_new_line = false
 ij_php_namespace_brace_style = 2
 ij_php_new_line_after_php_opening_tag = true
 ij_php_null_type_position = in_the_end
 ij_php_package_weight = 28
-ij_php_param_weight = 9
+ij_php_param_weight = 6
 ij_php_parameters_attributes_wrap = split_into_lines
 ij_php_parentheses_expression_new_line_after_left_paren = false
 ij_php_parentheses_expression_right_paren_on_new_line = false
@@ -626,13 +626,13 @@ ij_php_phpdoc_use_fqcn = true
 ij_php_phpdoc_wrap_long_lines = true
 ij_php_place_assignment_sign_on_next_line = false
 ij_php_place_parens_for_constructor = 0
-ij_php_property_read_weight = 11
-ij_php_property_weight = 10
-ij_php_property_write_weight = 12
+ij_php_property_read_weight = 8
+ij_php_property_weight = 7
+ij_php_property_write_weight = 9
 ij_php_return_type_on_new_line = false
-ij_php_return_weight = 15
-ij_php_see_weight = 6
-ij_php_since_weight = 2
+ij_php_return_weight = 12
+ij_php_see_weight = 2
+ij_php_since_weight = 1
 ij_php_sort_phpdoc_elements = true
 ij_php_space_after_colon = true
 ij_php_space_after_colon_in_enum_backed_type = true
@@ -706,16 +706,15 @@ ij_php_special_else_if_treatment = false
 ij_php_subpackage_weight = 28
 ij_php_ternary_operation_signs_on_next_line = true
 ij_php_ternary_operation_wrap = on_every_item
-ij_php_throws_weight = 14
+ij_php_throws_weight = 11
 ij_php_todo_weight = 28
-ij_php_treat_multiline_arrays_and_lambdas_multiline = false
 ij_php_unknown_tag_weight = 28
 ij_php_upper_case_boolean_const = false
 ij_php_upper_case_null_const = false
 ij_php_uses_weight = 28
 ij_php_var_weight = 28
 ij_php_variable_naming_style = snake_case
-ij_php_version_weight = 8
+ij_php_version_weight = 5
 ij_php_while_brace_force = always
 ij_php_while_on_new_line = true
 
@@ -767,17 +766,13 @@ ij_markdown_force_one_space_after_blockquote_symbol = true
 ij_markdown_force_one_space_after_header_symbol = true
 ij_markdown_force_one_space_after_list_bullet = true
 ij_markdown_force_one_space_between_words = true
-ij_markdown_insert_quote_arrows_on_wrap = true
 ij_markdown_keep_indents_on_empty_lines = false
-ij_markdown_keep_line_breaks_inside_text_blocks = true
 ij_markdown_max_lines_around_block_elements = 1
 ij_markdown_max_lines_around_header = 1
 ij_markdown_max_lines_between_paragraphs = 1
 ij_markdown_min_lines_around_block_elements = 1
 ij_markdown_min_lines_around_header = 2
 ij_markdown_min_lines_between_paragraphs = 1
-ij_markdown_wrap_text_if_long = true
-ij_markdown_wrap_text_inside_blockquotes = true
 
 [{*.yaml,*.yml}]
 ij_yaml_align_values_properties = do_not_align

composer.json

@@ -32,5 +32,12 @@
         "psr-4": {
             "Tests\\": "tests"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dragon-code/codestyler": true,
+            "ergebnis/composer-normalize": true,
+            "friendsofphp/php-cs-fixer": true
+        }
     }
 }

phpunit.php

@@ -7,9 +7,7 @@
  * file that was distributed with this source code.
  *
  * @author Andrey Helldar <helldar@dragon-code.pro>
- *
  * @copyright 2022 Andrey Helldar
- *
  * @license MIT
  *
  * @see https://github.com/Laravel-Lang/publisher