From cacb6eebbf1a7bddee13a5b2251e200fa782a0fa Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 10 Jul 2023 02:43:01 +0300 Subject: [PATCH] WIP --- .editorconfig | 102 ++++++++++++++++++++++++++++---------------------- LICENSE | 4 +- README.md | 2 +- composer.json | 30 +++++++++++++-- 4 files changed, 86 insertions(+), 52 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9735e73..f3d514f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ end_of_line = lf indent_size = 4 indent_style = space insert_final_newline = true -max_line_length = 180 +max_line_length = 120 tab_width = 4 trim_trailing_whitespace = true ij_continuation_indent_size = 8 @@ -23,16 +23,16 @@ ij_blade_keep_indents_on_empty_lines = false ij_css_align_closing_brace_with_properties = false ij_css_blank_lines_around_nested_selector = 1 ij_css_blank_lines_between_blocks = 1 -ij_css_block_comment_add_space = false +ij_css_block_comment_add_space = true ij_css_brace_placement = end_of_line -ij_css_enforce_quotes_on_format = false +ij_css_enforce_quotes_on_format = true ij_css_hex_color_long_format = true ij_css_hex_color_lower_case = false ij_css_hex_color_short_format = false ij_css_hex_color_upper_case = true ij_css_keep_blank_lines_in_code = 1 ij_css_keep_indents_on_empty_lines = false -ij_css_keep_single_line_blocks = true +ij_css_keep_single_line_blocks = false ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow ij_css_space_after_colon = true ij_css_space_before_opening_brace = true @@ -92,7 +92,7 @@ ij_sass_value_alignment = 0 ij_scss_align_closing_brace_with_properties = false ij_scss_blank_lines_around_nested_selector = 1 ij_scss_blank_lines_between_blocks = 1 -ij_scss_block_comment_add_space = false +ij_scss_block_comment_add_space = true ij_scss_brace_placement = 0 ij_scss_enforce_quotes_on_format = true ij_scss_hex_color_long_format = true @@ -101,13 +101,13 @@ ij_scss_hex_color_short_format = false ij_scss_hex_color_upper_case = true ij_scss_keep_blank_lines_in_code = 1 ij_scss_keep_indents_on_empty_lines = false -ij_scss_keep_single_line_blocks = true +ij_scss_keep_single_line_blocks = false ij_scss_line_comment_add_space = false ij_scss_line_comment_at_first_column = false ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow ij_scss_space_after_colon = true ij_scss_space_before_opening_brace = true -ij_scss_use_double_quotes = false +ij_scss_use_double_quotes = true ij_scss_value_alignment = 0 [*.twig] @@ -188,11 +188,11 @@ ij_typescript_call_parameters_right_paren_on_new_line = false ij_typescript_call_parameters_wrap = off ij_typescript_catch_on_new_line = false ij_typescript_chained_call_dot_on_new_line = true -ij_typescript_class_brace_style = end_of_line +ij_typescript_class_brace_style = next_line ij_typescript_comma_on_new_line = false ij_typescript_do_while_brace_force = never ij_typescript_else_on_new_line = false -ij_typescript_enforce_trailing_comma = keep +ij_typescript_enforce_trailing_comma = remove ij_typescript_enum_constants_wrap = on_every_item ij_typescript_extends_keyword_wrap = off ij_typescript_extends_list_wrap = off @@ -203,8 +203,8 @@ ij_typescript_for_brace_force = never ij_typescript_for_statement_new_line_after_left_paren = false ij_typescript_for_statement_right_paren_on_new_line = false ij_typescript_for_statement_wrap = off -ij_typescript_force_quote_style = false -ij_typescript_force_semicolon_style = false +ij_typescript_force_quote_style = true +ij_typescript_force_semicolon_style = true ij_typescript_function_expression_brace_style = end_of_line ij_typescript_if_brace_force = never ij_typescript_import_merge_members = global @@ -218,7 +218,7 @@ ij_typescript_indent_chained_calls = true ij_typescript_indent_package_children = 0 ij_typescript_jsdoc_include_types = false ij_typescript_jsx_attribute_value = braces -ij_typescript_keep_blank_lines_in_code = 2 +ij_typescript_keep_blank_lines_in_code = 1 ij_typescript_keep_first_column_comment = true ij_typescript_keep_indents_on_empty_lines = false ij_typescript_keep_line_breaks = true @@ -226,7 +226,7 @@ ij_typescript_keep_simple_blocks_in_one_line = false ij_typescript_keep_simple_methods_in_one_line = false ij_typescript_line_comment_add_space = true ij_typescript_line_comment_at_first_column = false -ij_typescript_method_brace_style = end_of_line +ij_typescript_method_brace_style = next_line ij_typescript_method_call_chain_wrap = off ij_typescript_method_parameters_new_line_after_left_paren = false ij_typescript_method_parameters_right_paren_on_new_line = false @@ -248,7 +248,7 @@ ij_typescript_space_after_generator_mult = true ij_typescript_space_after_property_colon = true ij_typescript_space_after_quest = true ij_typescript_space_after_type_colon = true -ij_typescript_space_after_unary_not = false +ij_typescript_space_after_unary_not = true ij_typescript_space_before_async_arrow_lparen = true ij_typescript_space_before_catch_keyword = true ij_typescript_space_before_catch_left_brace = true @@ -297,11 +297,11 @@ ij_typescript_spaces_within_brackets = false ij_typescript_spaces_within_catch_parentheses = false ij_typescript_spaces_within_for_parentheses = false ij_typescript_spaces_within_if_parentheses = false -ij_typescript_spaces_within_imports = false -ij_typescript_spaces_within_interpolation_expressions = false +ij_typescript_spaces_within_imports = true +ij_typescript_spaces_within_interpolation_expressions = true ij_typescript_spaces_within_method_call_parentheses = false ij_typescript_spaces_within_method_parentheses = false -ij_typescript_spaces_within_object_literal_braces = false +ij_typescript_spaces_within_object_literal_braces = true ij_typescript_spaces_within_object_type_braces = true ij_typescript_spaces_within_parentheses = false ij_typescript_spaces_within_switch_parentheses = false @@ -313,11 +313,11 @@ ij_typescript_ternary_operation_signs_on_next_line = false ij_typescript_ternary_operation_wrap = off ij_typescript_union_types_wrap = on_every_item ij_typescript_use_chained_calls_group_indents = false -ij_typescript_use_double_quotes = true +ij_typescript_use_double_quotes = false ij_typescript_use_explicit_js_extension = auto ij_typescript_use_path_mapping = always ij_typescript_use_public_modifier = false -ij_typescript_use_semicolon_after_statement = true +ij_typescript_use_semicolon_after_statement = false ij_typescript_var_declaration_wrap = normal ij_typescript_while_brace_force = never ij_typescript_while_on_new_line = false @@ -393,7 +393,7 @@ ij_javascript_indent_case_from_switch = true ij_javascript_indent_chained_calls = true ij_javascript_indent_package_children = 0 ij_javascript_jsx_attribute_value = braces -ij_javascript_keep_blank_lines_in_code = 2 +ij_javascript_keep_blank_lines_in_code = 1 ij_javascript_keep_first_column_comment = true ij_javascript_keep_indents_on_empty_lines = false ij_javascript_keep_line_breaks = true @@ -487,12 +487,12 @@ ij_javascript_special_else_if_treatment = true ij_javascript_ternary_operation_signs_on_next_line = false ij_javascript_ternary_operation_wrap = off ij_javascript_union_types_wrap = on_every_item -ij_javascript_use_chained_calls_group_indents = true +ij_javascript_use_chained_calls_group_indents = false ij_javascript_use_double_quotes = false ij_javascript_use_explicit_js_extension = auto ij_javascript_use_path_mapping = always ij_javascript_use_public_modifier = false -ij_javascript_use_semicolon_after_statement = true +ij_javascript_use_semicolon_after_statement = false ij_javascript_var_declaration_wrap = on_every_item ij_javascript_while_brace_force = never ij_javascript_while_on_new_line = false @@ -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 = true +ij_php_align_multiline_binary_operation = false ij_php_align_multiline_chained_methods = false ij_php_align_multiline_extends_list = true ij_php_align_multiline_for = false @@ -517,14 +517,14 @@ ij_php_align_multiline_ternary_operation = false ij_php_align_named_arguments = true ij_php_align_phpdoc_comments = false ij_php_align_phpdoc_param_names = false -ij_php_anonymous_brace_style = end_of_line +ij_php_anonymous_brace_style = next_line ij_php_api_weight = 28 ij_php_array_initializer_new_line_after_left_brace = true 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 = 4 +ij_php_author_weight = 3 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 @@ -546,22 +546,25 @@ ij_php_block_brace_style = end_of_line ij_php_call_parameters_new_line_after_left_paren = false ij_php_call_parameters_right_paren_on_new_line = false ij_php_call_parameters_wrap = on_every_item -ij_php_catch_on_new_line = false +ij_php_catch_on_new_line = true ij_php_category_weight = 28 ij_php_class_brace_style = next_line +ij_php_comma_after_last_argument = false ij_php_comma_after_last_array_element = true +ij_php_comma_after_last_closure_use_var = false +ij_php_comma_after_last_parameter = false ij_php_concat_spaces = true -ij_php_copyright_weight = 28 +ij_php_copyright_weight = 4 ij_php_deprecated_weight = 0 ij_php_do_while_brace_force = always ij_php_else_if_style = combine -ij_php_else_on_new_line = false +ij_php_else_on_new_line = true ij_php_example_weight = 28 ij_php_extends_keyword_wrap = normal ij_php_extends_list_wrap = off ij_php_fields_default_visibility = protected ij_php_filesource_weight = 28 -ij_php_finally_on_new_line = false +ij_php_finally_on_new_line = true ij_php_for_brace_force = always ij_php_for_statement_new_line_after_left_paren = false ij_php_for_statement_right_paren_on_new_line = false @@ -572,7 +575,7 @@ ij_php_getters_setters_naming_style = camel_case ij_php_getters_setters_order_style = getters_first ij_php_global_weight = 28 ij_php_group_use_wrap = on_every_item -ij_php_if_brace_force = if_multiline +ij_php_if_brace_force = always ij_php_if_lparen_on_next_line = true ij_php_if_rparen_on_next_line = true ij_php_ignore_weight = 28 @@ -580,7 +583,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 = 28 +ij_php_internal_weight = 1 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 +596,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 = 28 +ij_php_license_weight = 5 ij_php_line_comment_add_space = false ij_php_line_comment_at_first_column = false -ij_php_link_weight = 3 +ij_php_link_weight = 7 ij_php_lower_case_boolean_const = true ij_php_lower_case_keywords = true ij_php_lower_case_null_const = true @@ -605,14 +608,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 = 10 +ij_php_method_weight = 13 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 = 6 +ij_php_param_weight = 9 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 +629,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 = 8 -ij_php_property_weight = 7 -ij_php_property_write_weight = 9 +ij_php_property_read_weight = 11 +ij_php_property_weight = 10 +ij_php_property_write_weight = 12 ij_php_return_type_on_new_line = false -ij_php_return_weight = 12 -ij_php_see_weight = 2 -ij_php_since_weight = 1 +ij_php_return_weight = 15 +ij_php_see_weight = 6 +ij_php_since_weight = 2 ij_php_sort_phpdoc_elements = true ij_php_space_after_colon = true ij_php_space_after_colon_in_enum_backed_type = true @@ -706,28 +709,33 @@ 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 = 11 +ij_php_throws_weight = 14 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 = 5 +ij_php_version_weight = 8 ij_php_while_brace_force = always ij_php_while_on_new_line = true [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] ij_continuation_indent_size = 4 +ij_json_array_wrapping = on_every_item ij_json_keep_blank_lines_in_code = 1 ij_json_keep_indents_on_empty_lines = false ij_json_keep_line_breaks = true +ij_json_keep_trailing_comma = false +ij_json_object_wrapping = on_every_item +ij_json_property_alignment = do_not_align ij_json_space_after_colon = true ij_json_space_after_comma = true -ij_json_space_before_colon = true +ij_json_space_before_colon = false ij_json_space_before_comma = false -ij_json_spaces_within_braces = false +ij_json_spaces_within_braces = true ij_json_spaces_within_brackets = false ij_json_wrap_long_lines = false @@ -766,13 +774,17 @@ 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 diff --git a/LICENSE b/LICENSE index 53776ce..740b9cd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Andrey Helldar +Copyright (c) 2023 Andrey Helldar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 6fc26f0..b85f660 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Tinkoff Online Cashier Driver -![cashier provider tinkoff online](https://preview.dragon-code.pro/cashier-provider/tinkoff-online.svg?brand=laravel) +![cashier provider tinkoff online](https://preview.dragon-code.pro/cashier-provider/tinkoff-online.svg?brand=laravel&mode=dark) [![Stable Version][badge_stable]][link_packagist] [![Unstable Version][badge_unstable]][link_packagist] diff --git a/composer.json b/composer.json index 6f88bc6..3c06130 100644 --- a/composer.json +++ b/composer.json @@ -17,17 +17,36 @@ "authors": [ { "name": "Andrey Helldar", - "email": "helldar@ai-rus.com" + "email": "helldar@dragon-code.pro", + "homepage": "https://github.com/andrey-helldar" } ], "support": { "issues": "https://github.com/cashier-provider/tinkoff-online/issues", "source": "https://github.com/cashier-provider/tinkoff-online" }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/TheDragonCode" + }, + { + "type": "open_collective", + "url": "https://opencollective.com/dragon-code" + }, + { + "type": "boosty", + "url": "https://boosty.to/dragon-code" + }, + { + "type": "yoomoney", + "url": "https://yoomoney.ru/to/410012608840929" + } + ], "require": { "php": "^7.3 || ^8.0", - "cashier-provider/core": "^2.5", - "cashier-provider/tinkoff-auth": "^2.1", + "cashier-provider/core": "^3.0", + "cashier-provider/tinkoff-auth": "^3.0", "psr/http-message": "^1.0" }, "require-dev": { @@ -52,7 +71,10 @@ }, "config": { "allow-plugins": { - "composer/package-versions-deprecated": true + "composer/package-versions-deprecated": true, + "dragon-code/codestyler": true, + "ergebnis/composer-normalize": true, + "friendsofphp/php-cs-fixer": true }, "preferred-install": "dist", "sort-packages": true