Update code-style

Author: andrey-helldar

.editorconfig

@@ -12,7 +12,7 @@ ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = true
 ij_smart_tabs = false
-ij_visual_guides = none
+ij_visual_guides = 
 ij_wrap_on_typing = false
 
 [*.blade.php]
@@ -39,28 +39,6 @@ ij_css_space_before_opening_brace = true
 ij_css_use_double_quotes = true
 ij_css_value_alignment = do_not_align
 
-[*.less]
-ij_less_align_closing_brace_with_properties = false
-ij_less_blank_lines_around_nested_selector = 1
-ij_less_blank_lines_between_blocks = 1
-ij_less_block_comment_add_space = false
-ij_less_brace_placement = 0
-ij_less_enforce_quotes_on_format = false
-ij_less_hex_color_long_format = true
-ij_less_hex_color_lower_case = false
-ij_less_hex_color_short_format = false
-ij_less_hex_color_upper_case = true
-ij_less_keep_blank_lines_in_code = 2
-ij_less_keep_indents_on_empty_lines = false
-ij_less_keep_single_line_blocks = false
-ij_less_line_comment_add_space = false
-ij_less_line_comment_at_first_column = false
-ij_less_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_less_space_after_colon = true
-ij_less_space_before_opening_brace = true
-ij_less_use_double_quotes = true
-ij_less_value_alignment = 0
-
 [*.sass]
 ij_sass_align_closing_brace_with_properties = false
 ij_sass_blank_lines_around_nested_selector = 1
@@ -104,12 +82,6 @@ ij_scss_space_before_opening_brace = true
 ij_scss_use_double_quotes = true
 ij_scss_value_alignment = 0
 
-[*.twig]
-ij_twig_keep_indents_on_empty_lines = false
-ij_twig_spaces_inside_comments_delimiters = true
-ij_twig_spaces_inside_delimiters = true
-ij_twig_spaces_inside_variable_delimiters = true
-
 [*.vue]
 ij_continuation_indent_size = 4
 ij_vue_indent_children_of_top_level = template
@@ -183,6 +155,9 @@ 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 = next_line
+ij_typescript_class_decorator_wrap = split_into_lines
+ij_typescript_class_field_decorator_wrap = off
+ij_typescript_class_method_decorator_wrap = off
 ij_typescript_comma_on_new_line = false
 ij_typescript_do_while_brace_force = never
 ij_typescript_else_on_new_line = false
@@ -200,6 +175,7 @@ ij_typescript_for_statement_wrap = off
 ij_typescript_force_quote_style = true
 ij_typescript_force_semicolon_style = true
 ij_typescript_function_expression_brace_style = end_of_line
+ij_typescript_function_parameter_decorator_wrap = off
 ij_typescript_if_brace_force = never
 ij_typescript_import_merge_members = global
 ij_typescript_import_prefer_absolute_path = global
@@ -235,6 +211,7 @@ ij_typescript_prefer_explicit_types_function_expression_returns = false
 ij_typescript_prefer_explicit_types_function_returns = false
 ij_typescript_prefer_explicit_types_vars_fields = false
 ij_typescript_prefer_parameters_wrap = false
+ij_typescript_property_prefix = 
 ij_typescript_reformat_c_style_comments = false
 ij_typescript_space_after_colon = true
 ij_typescript_space_after_comma = true
@@ -310,6 +287,7 @@ ij_typescript_union_types_wrap = on_every_item
 ij_typescript_use_chained_calls_group_indents = false
 ij_typescript_use_double_quotes = false
 ij_typescript_use_explicit_js_extension = auto
+ij_typescript_use_import_type = auto
 ij_typescript_use_path_mapping = always
 ij_typescript_use_public_modifier = false
 ij_typescript_use_semicolon_after_statement = false
@@ -318,15 +296,7 @@ ij_typescript_while_brace_force = never
 ij_typescript_while_on_new_line = false
 ij_typescript_wrap_comments = false
 
-[{*.bash,*.sh,*.zsh}]
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-ij_shell_use_unix_line_separator = true
-
-[{*.cjs,*.js}]
+[{*.cjs,*.es6,*.js,*.mjs}]
 ij_continuation_indent_size = 4
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
@@ -361,6 +331,9 @@ ij_javascript_call_parameters_wrap = off
 ij_javascript_catch_on_new_line = false
 ij_javascript_chained_call_dot_on_new_line = true
 ij_javascript_class_brace_style = next_line
+ij_javascript_class_decorator_wrap = split_into_lines
+ij_javascript_class_field_decorator_wrap = off
+ij_javascript_class_method_decorator_wrap = off
 ij_javascript_comma_on_new_line = false
 ij_javascript_do_while_brace_force = never
 ij_javascript_else_on_new_line = false
@@ -377,6 +350,7 @@ ij_javascript_for_statement_wrap = off
 ij_javascript_force_quote_style = true
 ij_javascript_force_semicolon_style = true
 ij_javascript_function_expression_brace_style = end_of_line
+ij_javascript_function_parameter_decorator_wrap = off
 ij_javascript_if_brace_force = never
 ij_javascript_import_merge_members = global
 ij_javascript_import_prefer_absolute_path = true
@@ -411,6 +385,7 @@ ij_javascript_prefer_explicit_types_function_expression_returns = false
 ij_javascript_prefer_explicit_types_function_returns = false
 ij_javascript_prefer_explicit_types_vars_fields = false
 ij_javascript_prefer_parameters_wrap = false
+ij_javascript_property_prefix = 
 ij_javascript_reformat_c_style_comments = false
 ij_javascript_space_after_colon = true
 ij_javascript_space_after_comma = true
@@ -486,6 +461,7 @@ ij_javascript_union_types_wrap = on_every_item
 ij_javascript_use_chained_calls_group_indents = false
 ij_javascript_use_double_quotes = false
 ij_javascript_use_explicit_js_extension = auto
+ij_javascript_use_import_type = auto
 ij_javascript_use_path_mapping = always
 ij_javascript_use_public_modifier = false
 ij_javascript_use_semicolon_after_statement = false
@@ -494,7 +470,7 @@ ij_javascript_while_brace_force = never
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
-[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml,*.stub}]
 ij_continuation_indent_size = 4
 ij_php_align_assignments = true
 ij_php_align_class_constants = true
@@ -518,7 +494,7 @@ ij_php_anonymous_brace_style = end_of_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_array_initializer_wrap = normal
 ij_php_assignment_wrap = on_every_item
 ij_php_attributes_wrap = split_into_lines
 ij_php_author_weight = 3
@@ -544,20 +520,23 @@ ij_php_block_brace_style = end_of_line
 ij_php_call_parameters_new_line_after_left_paren = true
 ij_php_call_parameters_right_paren_on_new_line = true
 ij_php_call_parameters_wrap = on_every_item
-ij_php_catch_on_new_line = true
+ij_php_catch_on_new_line = false
 ij_php_category_weight = 28
 ij_php_class_brace_style = next_line
 ij_php_comma_after_last_argument = false
+ij_php_comma_after_last_argument_style = when_multiline
 ij_php_comma_after_last_array_element = true
 ij_php_comma_after_last_closure_use_var = false
+ij_php_comma_after_last_closure_use_var_style = when_multiline
 ij_php_comma_after_last_match_arm = true
 ij_php_comma_after_last_parameter = false
+ij_php_comma_after_last_parameter_style = when_multiline
 ij_php_concat_spaces = true
 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 = true
+ij_php_else_on_new_line = false
 ij_php_example_weight = 28
 ij_php_extends_keyword_wrap = normal
 ij_php_extends_list_wrap = on_every_item
@@ -568,12 +547,14 @@ 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
 ij_php_for_statement_wrap = normal
+ij_php_force_empty_classes_in_one_line = true
 ij_php_force_empty_methods_in_one_line = true
 ij_php_force_short_declaration_array_style = true
 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_heredoc_on_same_line = false
 ij_php_if_brace_force = always
 ij_php_if_lparen_on_next_line = true
 ij_php_if_rparen_on_next_line = true
@@ -609,7 +590,9 @@ 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_modifier_list_wrap = false
+ij_php_multiline_chained_calls_first_call_on_new_line = false
 ij_php_multiline_chained_calls_semicolon_on_new_line = false
+ij_php_multiline_closure_lambda_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
@@ -627,7 +610,7 @@ ij_php_phpdoc_param_spaces_between_type_and_name = 2
 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 = 1
+ij_php_place_parens_for_constructor = 2
 ij_php_property_read_weight = 11
 ij_php_property_weight = 10
 ij_php_property_write_weight = 12
@@ -719,9 +702,9 @@ ij_php_var_weight = 28
 ij_php_variable_naming_style = camel_case
 ij_php_version_weight = 8
 ij_php_while_brace_force = always
-ij_php_while_on_new_line = true
+ij_php_while_on_new_line = false
 
-[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
+[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,.ws-context,composer.lock,jest.config}]
 ij_continuation_indent_size = 4
 ij_json_array_wrapping = on_every_item
 ij_json_keep_blank_lines_in_code = 1
@@ -769,9 +752,11 @@ ij_html_space_inside_empty_tag = true
 ij_html_text_wrap = off
 
 [{*.http,*.rest}]
-indent_size = 0
 ij_continuation_indent_size = 4
-ij_http request_call_parameters_wrap = on_every_item
+ij_http-request_call_parameters_wrap = on_every_item
+ij_http-request_method_parameters_wrap = split_into_lines
+ij_http-request_space_before_comma = true
+ij_http-request_spaces_around_assignment_operators = true
 
 [{*.markdown,*.md}]
 ij_markdown_force_one_space_after_blockquote_symbol = true
@@ -798,6 +783,9 @@ ij_yaml_block_mapping_on_new_line = false
 ij_yaml_indent_sequence_value = true
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
+ij_yaml_line_comment_add_space = false
+ij_yaml_line_comment_add_space_on_reformat = false
+ij_yaml_line_comment_at_first_column = true
 ij_yaml_sequence_on_new_line = true
 ij_yaml_space_before_colon = false
 ij_yaml_spaces_within_braces = true

.gitattributes

@@ -8,3 +8,4 @@ tests/ export-ignore
 .gitignore export-ignore
 
 phpunit.xml export-ignore
+pint.json export-ignore

.github/workflows/code-style.yml

@@ -1,4 +1,4 @@
-name: code-style
+name: Code Style
 
 on:
     push:
@@ -7,29 +7,5 @@ on:
 permissions: write-all
 
 jobs:
-    check:
-        if: ${{ ! (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
-
-        runs-on: ubuntu-latest
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v5
-
-            -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v5
-    
-    fix:
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        
-        runs-on: ubuntu-latest
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v5
-
-            -   name: Checking PHP Syntax
-                uses: TheDragonCode/codestyler@v5
-                with:
-                    github_token: ${{ secrets.COMPOSER_TOKEN }}
-                    fix: true
+    Styler:
+        uses: TheDragonCode/.github/.github/workflows/code-style.yml@main

composer.json

@@ -38,6 +38,7 @@
         "dragon-code/support": "^6.0"
     },
     "require-dev": {
+        "dragon-code/codestyler": "^6.2",
         "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
         "symfony/var-dumper": "^6.0 || ^7.0"
     },
@@ -61,5 +62,13 @@
         },
         "preferred-install": "dist",
         "sort-packages": true
+    },
+    "scripts": {
+        "post-update-cmd": [
+            "vendor/bin/codestyle pint 8.2",
+            "vendor/bin/codestyle editorconfig",
+            "composer normalize"
+        ],
+        "style": "vendor/bin/pint"
     }
 }