From cbb065a7043ded93623b9e38d4dc9236313f2676 Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Thu, 10 Dec 2020 17:39:04 +0100 Subject: [PATCH] Code cleaning --- .editorconfig | 649 +++++++++++++++++++++++++++++++-- .travis.yml | 79 ++-- composer.lock | 72 ++-- patches/doctrine.orm.uuid.diff | 24 +- tests/travis.php.ini | 1 + 5 files changed, 713 insertions(+), 112 deletions(-) create mode 100644 tests/travis.php.ini diff --git a/.editorconfig b/.editorconfig index cc7e544..389b388 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,124 @@ ij_formatter_tags_enabled = false ij_smart_tabs = false ij_wrap_on_typing = false +[*.blade.php] +ij_blade_keep_indents_on_empty_lines = false + +[*.css] +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_brace_placement = end_of_line +ij_css_enforce_quotes_on_format = false +ij_css_hex_color_long_format = false +ij_css_hex_color_lower_case = false +ij_css_hex_color_short_format = false +ij_css_hex_color_upper_case = false +ij_css_keep_blank_lines_in_code = 2 +ij_css_keep_indents_on_empty_lines = false +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 +ij_css_use_double_quotes = true +ij_css_value_alignment = do_not_align + +[*.feature] +indent_size = 2 +ij_gherkin_keep_indents_on_empty_lines = false + +[*.haml] +indent_size = 2 +ij_haml_keep_indents_on_empty_lines = false + +[*.latte] +ij_latte_keep_blank_lines_in_code = 2 +ij_latte_spaces_around_assignment_operators = true +ij_latte_spaces_around_bitwise_operators = true +ij_latte_spaces_around_equality_operators = true +ij_latte_spaces_around_logical_operators = true +ij_latte_spaces_around_multiplicative_operators = true +ij_latte_spaces_around_relational_operators = true +ij_latte_spaces_around_unary_operator = false + +[*.less] +indent_size = 2 +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_brace_placement = 0 +ij_less_enforce_quotes_on_format = false +ij_less_hex_color_long_format = false +ij_less_hex_color_lower_case = false +ij_less_hex_color_short_format = false +ij_less_hex_color_upper_case = false +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_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] +indent_size = 2 +ij_sass_align_closing_brace_with_properties = false +ij_sass_blank_lines_around_nested_selector = 1 +ij_sass_blank_lines_between_blocks = 1 +ij_sass_brace_placement = 0 +ij_sass_enforce_quotes_on_format = false +ij_sass_hex_color_long_format = false +ij_sass_hex_color_lower_case = false +ij_sass_hex_color_short_format = false +ij_sass_hex_color_upper_case = false +ij_sass_keep_blank_lines_in_code = 2 +ij_sass_keep_indents_on_empty_lines = false +ij_sass_keep_single_line_blocks = false +ij_sass_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_sass_space_after_colon = true +ij_sass_space_before_opening_brace = true +ij_sass_use_double_quotes = true +ij_sass_value_alignment = 0 + +[*.scss] +indent_size = 2 +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_brace_placement = 0 +ij_scss_enforce_quotes_on_format = false +ij_scss_hex_color_long_format = false +ij_scss_hex_color_lower_case = false +ij_scss_hex_color_short_format = false +ij_scss_hex_color_upper_case = false +ij_scss_keep_blank_lines_in_code = 2 +ij_scss_keep_indents_on_empty_lines = false +ij_scss_keep_single_line_blocks = 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 = 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] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 4 +ij_vue_indent_children_of_top_level = template +ij_vue_interpolation_new_line_after_start_delimiter = true +ij_vue_interpolation_new_line_before_end_delimiter = true +ij_vue_interpolation_wrap = off +ij_vue_keep_indents_on_empty_lines = false +ij_vue_spaces_within_interpolation_expressions = true +ij_vue_uniform_indent = true + [.editorconfig] ij_editorconfig_align_group_field_declarations = false ij_editorconfig_space_after_colon = false @@ -21,7 +139,193 @@ ij_editorconfig_space_before_colon = false ij_editorconfig_space_before_comma = false ij_editorconfig_spaces_around_assignment_operators = true -[{*.bash, *.sh, *.zsh}] +[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}] +ij_xml_align_attributes = true +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal + +[{*.ats,*.ts}] +ij_continuation_indent_size = 4 +ij_typescript_align_imports = false +ij_typescript_align_multiline_array_initializer_expression = false +ij_typescript_align_multiline_binary_operation = false +ij_typescript_align_multiline_chained_methods = false +ij_typescript_align_multiline_extends_list = false +ij_typescript_align_multiline_for = true +ij_typescript_align_multiline_parameters = true +ij_typescript_align_multiline_parameters_in_calls = false +ij_typescript_align_multiline_ternary_operation = false +ij_typescript_align_object_properties = 0 +ij_typescript_align_union_types = false +ij_typescript_align_var_statements = 0 +ij_typescript_array_initializer_new_line_after_left_brace = false +ij_typescript_array_initializer_right_brace_on_new_line = false +ij_typescript_array_initializer_wrap = off +ij_typescript_assignment_wrap = off +ij_typescript_binary_operation_sign_on_next_line = false +ij_typescript_binary_operation_wrap = off +ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_typescript_blank_lines_after_imports = 1 +ij_typescript_blank_lines_around_class = 1 +ij_typescript_blank_lines_around_field = 0 +ij_typescript_blank_lines_around_field_in_interface = 0 +ij_typescript_blank_lines_around_function = 1 +ij_typescript_blank_lines_around_method = 1 +ij_typescript_blank_lines_around_method_in_interface = 1 +ij_typescript_block_brace_style = end_of_line +ij_typescript_call_parameters_new_line_after_left_paren = false +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_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_extends_keyword_wrap = off +ij_typescript_extends_list_wrap = off +ij_typescript_field_prefix = _ +ij_typescript_file_name_style = relaxed +ij_typescript_finally_on_new_line = false +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_function_expression_brace_style = end_of_line +ij_typescript_if_brace_force = never +ij_typescript_import_merge_members = global +ij_typescript_import_prefer_absolute_path = global +ij_typescript_import_sort_members = true +ij_typescript_import_sort_module_name = false +ij_typescript_import_use_node_resolution = true +ij_typescript_imports_wrap = on_every_item +ij_typescript_indent_case_from_switch = true +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_first_column_comment = true +ij_typescript_keep_indents_on_empty_lines = false +ij_typescript_keep_line_breaks = true +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_call_chain_wrap = off +ij_typescript_method_parameters_new_line_after_left_paren = false +ij_typescript_method_parameters_right_paren_on_new_line = false +ij_typescript_method_parameters_wrap = off +ij_typescript_object_literal_wrap = on_every_item +ij_typescript_parentheses_expression_new_line_after_left_paren = false +ij_typescript_parentheses_expression_right_paren_on_new_line = false +ij_typescript_place_assignment_sign_on_next_line = false +ij_typescript_prefer_as_type_cast = false +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_reformat_c_style_comments = false +ij_typescript_space_after_colon = true +ij_typescript_space_after_comma = true +ij_typescript_space_after_dots_in_rest_parameter = false +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_before_async_arrow_lparen = true +ij_typescript_space_before_catch_keyword = true +ij_typescript_space_before_catch_left_brace = true +ij_typescript_space_before_catch_parentheses = true +ij_typescript_space_before_class_lbrace = true +ij_typescript_space_before_class_left_brace = true +ij_typescript_space_before_colon = true +ij_typescript_space_before_comma = false +ij_typescript_space_before_do_left_brace = true +ij_typescript_space_before_else_keyword = true +ij_typescript_space_before_else_left_brace = true +ij_typescript_space_before_finally_keyword = true +ij_typescript_space_before_finally_left_brace = true +ij_typescript_space_before_for_left_brace = true +ij_typescript_space_before_for_parentheses = true +ij_typescript_space_before_for_semicolon = false +ij_typescript_space_before_function_left_parenth = true +ij_typescript_space_before_generator_mult = false +ij_typescript_space_before_if_left_brace = true +ij_typescript_space_before_if_parentheses = true +ij_typescript_space_before_method_call_parentheses = false +ij_typescript_space_before_method_left_brace = true +ij_typescript_space_before_method_parentheses = false +ij_typescript_space_before_property_colon = false +ij_typescript_space_before_quest = true +ij_typescript_space_before_switch_left_brace = true +ij_typescript_space_before_switch_parentheses = true +ij_typescript_space_before_try_left_brace = true +ij_typescript_space_before_type_colon = false +ij_typescript_space_before_unary_not = false +ij_typescript_space_before_while_keyword = true +ij_typescript_space_before_while_left_brace = true +ij_typescript_space_before_while_parentheses = true +ij_typescript_spaces_around_additive_operators = true +ij_typescript_spaces_around_arrow_function_operator = true +ij_typescript_spaces_around_assignment_operators = true +ij_typescript_spaces_around_bitwise_operators = true +ij_typescript_spaces_around_equality_operators = true +ij_typescript_spaces_around_logical_operators = true +ij_typescript_spaces_around_multiplicative_operators = true +ij_typescript_spaces_around_relational_operators = true +ij_typescript_spaces_around_shift_operators = true +ij_typescript_spaces_around_unary_operator = false +ij_typescript_spaces_within_array_initializer_brackets = false +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_method_call_parentheses = false +ij_typescript_spaces_within_method_parentheses = false +ij_typescript_spaces_within_object_literal_braces = false +ij_typescript_spaces_within_object_type_braces = true +ij_typescript_spaces_within_parentheses = false +ij_typescript_spaces_within_switch_parentheses = false +ij_typescript_spaces_within_type_assertion = false +ij_typescript_spaces_within_union_types = true +ij_typescript_spaces_within_while_parentheses = false +ij_typescript_special_else_if_treatment = true +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_explicit_js_extension = global +ij_typescript_use_path_mapping = always +ij_typescript_use_public_modifier = false +ij_typescript_use_semicolon_after_statement = true +ij_typescript_var_declaration_wrap = normal +ij_typescript_while_brace_force = never +ij_typescript_while_on_new_line = false +ij_typescript_wrap_comments = false + +[{*.bash,*.sh,*.zsh}] indent_size = 2 tab_width = 2 ij_shell_binary_ops_start_line = false @@ -30,20 +334,282 @@ ij_shell_minify_program = false ij_shell_redirect_followed_by_space = false ij_shell_switch_cases_indented = false -[{*.ctp, *.hphp, *.inc, *.module, *.php, *.php4, *.php5, *.phpt, *.phtml}] +[{*.cjs,*.js}] +ij_continuation_indent_size = 4 +ij_javascript_align_imports = false +ij_javascript_align_multiline_array_initializer_expression = false +ij_javascript_align_multiline_binary_operation = false +ij_javascript_align_multiline_chained_methods = false +ij_javascript_align_multiline_extends_list = false +ij_javascript_align_multiline_for = true +ij_javascript_align_multiline_parameters = true +ij_javascript_align_multiline_parameters_in_calls = false +ij_javascript_align_multiline_ternary_operation = false +ij_javascript_align_object_properties = 0 +ij_javascript_align_union_types = false +ij_javascript_align_var_statements = 0 +ij_javascript_array_initializer_new_line_after_left_brace = false +ij_javascript_array_initializer_right_brace_on_new_line = false +ij_javascript_array_initializer_wrap = off +ij_javascript_assignment_wrap = off +ij_javascript_binary_operation_sign_on_next_line = false +ij_javascript_binary_operation_wrap = off +ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_javascript_blank_lines_after_imports = 1 +ij_javascript_blank_lines_around_class = 1 +ij_javascript_blank_lines_around_field = 0 +ij_javascript_blank_lines_around_function = 1 +ij_javascript_blank_lines_around_method = 1 +ij_javascript_block_brace_style = end_of_line +ij_javascript_call_parameters_new_line_after_left_paren = false +ij_javascript_call_parameters_right_paren_on_new_line = false +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 = end_of_line +ij_javascript_comma_on_new_line = false +ij_javascript_do_while_brace_force = never +ij_javascript_else_on_new_line = false +ij_javascript_enforce_trailing_comma = keep +ij_javascript_extends_keyword_wrap = off +ij_javascript_extends_list_wrap = off +ij_javascript_field_prefix = _ +ij_javascript_file_name_style = relaxed +ij_javascript_finally_on_new_line = false +ij_javascript_for_brace_force = never +ij_javascript_for_statement_new_line_after_left_paren = false +ij_javascript_for_statement_right_paren_on_new_line = false +ij_javascript_for_statement_wrap = off +ij_javascript_force_quote_style = false +ij_javascript_force_semicolon_style = false +ij_javascript_function_expression_brace_style = end_of_line +ij_javascript_if_brace_force = never +ij_javascript_import_merge_members = global +ij_javascript_import_prefer_absolute_path = global +ij_javascript_import_sort_members = true +ij_javascript_import_sort_module_name = false +ij_javascript_import_use_node_resolution = true +ij_javascript_imports_wrap = on_every_item +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_first_column_comment = true +ij_javascript_keep_indents_on_empty_lines = false +ij_javascript_keep_line_breaks = true +ij_javascript_keep_simple_blocks_in_one_line = false +ij_javascript_keep_simple_methods_in_one_line = false +ij_javascript_line_comment_add_space = true +ij_javascript_line_comment_at_first_column = false +ij_javascript_method_brace_style = end_of_line +ij_javascript_method_call_chain_wrap = off +ij_javascript_method_parameters_new_line_after_left_paren = false +ij_javascript_method_parameters_right_paren_on_new_line = false +ij_javascript_method_parameters_wrap = off +ij_javascript_object_literal_wrap = on_every_item +ij_javascript_parentheses_expression_new_line_after_left_paren = false +ij_javascript_parentheses_expression_right_paren_on_new_line = false +ij_javascript_place_assignment_sign_on_next_line = false +ij_javascript_prefer_as_type_cast = false +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_reformat_c_style_comments = false +ij_javascript_space_after_colon = true +ij_javascript_space_after_comma = true +ij_javascript_space_after_dots_in_rest_parameter = false +ij_javascript_space_after_generator_mult = true +ij_javascript_space_after_property_colon = true +ij_javascript_space_after_quest = true +ij_javascript_space_after_type_colon = true +ij_javascript_space_after_unary_not = false +ij_javascript_space_before_async_arrow_lparen = true +ij_javascript_space_before_catch_keyword = true +ij_javascript_space_before_catch_left_brace = true +ij_javascript_space_before_catch_parentheses = true +ij_javascript_space_before_class_lbrace = true +ij_javascript_space_before_class_left_brace = true +ij_javascript_space_before_colon = true +ij_javascript_space_before_comma = false +ij_javascript_space_before_do_left_brace = true +ij_javascript_space_before_else_keyword = true +ij_javascript_space_before_else_left_brace = true +ij_javascript_space_before_finally_keyword = true +ij_javascript_space_before_finally_left_brace = true +ij_javascript_space_before_for_left_brace = true +ij_javascript_space_before_for_parentheses = true +ij_javascript_space_before_for_semicolon = false +ij_javascript_space_before_function_left_parenth = true +ij_javascript_space_before_generator_mult = false +ij_javascript_space_before_if_left_brace = true +ij_javascript_space_before_if_parentheses = true +ij_javascript_space_before_method_call_parentheses = false +ij_javascript_space_before_method_left_brace = true +ij_javascript_space_before_method_parentheses = false +ij_javascript_space_before_property_colon = false +ij_javascript_space_before_quest = true +ij_javascript_space_before_switch_left_brace = true +ij_javascript_space_before_switch_parentheses = true +ij_javascript_space_before_try_left_brace = true +ij_javascript_space_before_type_colon = false +ij_javascript_space_before_unary_not = false +ij_javascript_space_before_while_keyword = true +ij_javascript_space_before_while_left_brace = true +ij_javascript_space_before_while_parentheses = true +ij_javascript_spaces_around_additive_operators = true +ij_javascript_spaces_around_arrow_function_operator = true +ij_javascript_spaces_around_assignment_operators = true +ij_javascript_spaces_around_bitwise_operators = true +ij_javascript_spaces_around_equality_operators = true +ij_javascript_spaces_around_logical_operators = true +ij_javascript_spaces_around_multiplicative_operators = true +ij_javascript_spaces_around_relational_operators = true +ij_javascript_spaces_around_shift_operators = true +ij_javascript_spaces_around_unary_operator = false +ij_javascript_spaces_within_array_initializer_brackets = false +ij_javascript_spaces_within_brackets = false +ij_javascript_spaces_within_catch_parentheses = false +ij_javascript_spaces_within_for_parentheses = false +ij_javascript_spaces_within_if_parentheses = false +ij_javascript_spaces_within_imports = false +ij_javascript_spaces_within_interpolation_expressions = false +ij_javascript_spaces_within_method_call_parentheses = false +ij_javascript_spaces_within_method_parentheses = false +ij_javascript_spaces_within_object_literal_braces = false +ij_javascript_spaces_within_object_type_braces = true +ij_javascript_spaces_within_parentheses = false +ij_javascript_spaces_within_switch_parentheses = false +ij_javascript_spaces_within_type_assertion = false +ij_javascript_spaces_within_union_types = true +ij_javascript_spaces_within_while_parentheses = false +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 = false +ij_javascript_use_double_quotes = true +ij_javascript_use_explicit_js_extension = global +ij_javascript_use_path_mapping = always +ij_javascript_use_public_modifier = false +ij_javascript_use_semicolon_after_statement = true +ij_javascript_var_declaration_wrap = normal +ij_javascript_while_brace_force = never +ij_javascript_while_on_new_line = false +ij_javascript_wrap_comments = false + +[{*.cjsx,*.coffee}] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 2 +ij_coffeescript_align_function_body = false +ij_coffeescript_align_imports = false +ij_coffeescript_align_multiline_array_initializer_expression = true +ij_coffeescript_align_multiline_parameters = true +ij_coffeescript_align_multiline_parameters_in_calls = false +ij_coffeescript_align_object_properties = 0 +ij_coffeescript_align_union_types = false +ij_coffeescript_align_var_statements = 0 +ij_coffeescript_array_initializer_new_line_after_left_brace = false +ij_coffeescript_array_initializer_right_brace_on_new_line = false +ij_coffeescript_array_initializer_wrap = normal +ij_coffeescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_coffeescript_blank_lines_around_function = 1 +ij_coffeescript_call_parameters_new_line_after_left_paren = false +ij_coffeescript_call_parameters_right_paren_on_new_line = false +ij_coffeescript_call_parameters_wrap = normal +ij_coffeescript_chained_call_dot_on_new_line = true +ij_coffeescript_comma_on_new_line = false +ij_coffeescript_enforce_trailing_comma = keep +ij_coffeescript_field_prefix = _ +ij_coffeescript_file_name_style = relaxed +ij_coffeescript_force_quote_style = false +ij_coffeescript_force_semicolon_style = false +ij_coffeescript_function_expression_brace_style = end_of_line +ij_coffeescript_import_merge_members = global +ij_coffeescript_import_prefer_absolute_path = global +ij_coffeescript_import_sort_members = true +ij_coffeescript_import_sort_module_name = false +ij_coffeescript_import_use_node_resolution = true +ij_coffeescript_imports_wrap = on_every_item +ij_coffeescript_indent_chained_calls = true +ij_coffeescript_indent_package_children = 0 +ij_coffeescript_jsx_attribute_value = braces +ij_coffeescript_keep_blank_lines_in_code = 2 +ij_coffeescript_keep_first_column_comment = true +ij_coffeescript_keep_indents_on_empty_lines = false +ij_coffeescript_keep_line_breaks = true +ij_coffeescript_keep_simple_methods_in_one_line = false +ij_coffeescript_method_parameters_new_line_after_left_paren = false +ij_coffeescript_method_parameters_right_paren_on_new_line = false +ij_coffeescript_method_parameters_wrap = off +ij_coffeescript_object_literal_wrap = on_every_item +ij_coffeescript_prefer_as_type_cast = false +ij_coffeescript_prefer_explicit_types_function_expression_returns = false +ij_coffeescript_prefer_explicit_types_function_returns = false +ij_coffeescript_prefer_explicit_types_vars_fields = false +ij_coffeescript_reformat_c_style_comments = false +ij_coffeescript_space_after_comma = true +ij_coffeescript_space_after_dots_in_rest_parameter = false +ij_coffeescript_space_after_generator_mult = true +ij_coffeescript_space_after_property_colon = true +ij_coffeescript_space_after_type_colon = true +ij_coffeescript_space_after_unary_not = false +ij_coffeescript_space_before_async_arrow_lparen = true +ij_coffeescript_space_before_class_lbrace = true +ij_coffeescript_space_before_comma = false +ij_coffeescript_space_before_function_left_parenth = true +ij_coffeescript_space_before_generator_mult = false +ij_coffeescript_space_before_property_colon = false +ij_coffeescript_space_before_type_colon = false +ij_coffeescript_space_before_unary_not = false +ij_coffeescript_spaces_around_additive_operators = true +ij_coffeescript_spaces_around_arrow_function_operator = true +ij_coffeescript_spaces_around_assignment_operators = true +ij_coffeescript_spaces_around_bitwise_operators = true +ij_coffeescript_spaces_around_equality_operators = true +ij_coffeescript_spaces_around_logical_operators = true +ij_coffeescript_spaces_around_multiplicative_operators = true +ij_coffeescript_spaces_around_relational_operators = true +ij_coffeescript_spaces_around_shift_operators = true +ij_coffeescript_spaces_around_unary_operator = false +ij_coffeescript_spaces_within_array_initializer_braces = false +ij_coffeescript_spaces_within_array_initializer_brackets = false +ij_coffeescript_spaces_within_imports = false +ij_coffeescript_spaces_within_index_brackets = false +ij_coffeescript_spaces_within_interpolation_expressions = false +ij_coffeescript_spaces_within_method_call_parentheses = false +ij_coffeescript_spaces_within_method_parentheses = false +ij_coffeescript_spaces_within_object_braces = false +ij_coffeescript_spaces_within_object_literal_braces = false +ij_coffeescript_spaces_within_object_type_braces = true +ij_coffeescript_spaces_within_range_brackets = false +ij_coffeescript_spaces_within_type_assertion = false +ij_coffeescript_spaces_within_union_types = true +ij_coffeescript_union_types_wrap = on_every_item +ij_coffeescript_use_chained_calls_group_indents = false +ij_coffeescript_use_double_quotes = true +ij_coffeescript_use_explicit_js_extension = global +ij_coffeescript_use_path_mapping = always +ij_coffeescript_use_public_modifier = false +ij_coffeescript_use_semicolon_after_statement = false +ij_coffeescript_var_declaration_wrap = normal + +[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phpt,*.phtml}] indent_style = tab ij_continuation_indent_size = 4 ij_php_align_assignments = false ij_php_align_class_constants = false -ij_php_align_group_field_declarations = false +ij_php_align_group_field_declarations = true ij_php_align_inline_comments = false ij_php_align_key_value_pairs = true -ij_php_align_multiline_array_initializer_expression = true +ij_php_align_multiline_array_initializer_expression = false ij_php_align_multiline_binary_operation = false ij_php_align_multiline_chained_methods = false ij_php_align_multiline_extends_list = false ij_php_align_multiline_for = true -ij_php_align_multiline_parameters = true +ij_php_align_multiline_parameters = false ij_php_align_multiline_parameters_in_calls = false ij_php_align_multiline_ternary_operation = false ij_php_align_phpdoc_comments = false @@ -52,12 +618,12 @@ 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 = off +ij_php_array_initializer_wrap = on_every_item ij_php_assignment_wrap = off ij_php_author_weight = 28 ij_php_binary_operation_sign_on_next_line = false ij_php_binary_operation_wrap = off -ij_php_blank_lines_after_class_header = 0 +ij_php_blank_lines_after_class_header = 1 ij_php_blank_lines_after_function = 1 ij_php_blank_lines_after_imports = 1 ij_php_blank_lines_after_opening_tag = 0 @@ -66,7 +632,7 @@ ij_php_blank_lines_around_class = 1 ij_php_blank_lines_around_constants = 0 ij_php_blank_lines_around_field = 0 ij_php_blank_lines_around_method = 1 -ij_php_blank_lines_before_class_end = 0 +ij_php_blank_lines_before_class_end = 1 ij_php_blank_lines_before_imports = 1 ij_php_blank_lines_before_method_body = 0 ij_php_blank_lines_before_package = 1 @@ -79,12 +645,12 @@ ij_php_call_parameters_wrap = off ij_php_catch_on_new_line = false ij_php_category_weight = 28 ij_php_class_brace_style = next_line -ij_php_comma_after_last_array_element = false +ij_php_comma_after_last_array_element = true ij_php_concat_spaces = true ij_php_copyright_weight = 28 ij_php_deprecated_weight = 28 ij_php_do_while_brace_force = never -ij_php_else_if_style = as_is +ij_php_else_if_style = combine ij_php_else_on_new_line = false ij_php_example_weight = 28 ij_php_extends_keyword_wrap = off @@ -96,7 +662,9 @@ ij_php_for_brace_force = never 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 = off -ij_php_force_short_declaration_array_style = false +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_if_brace_force = never @@ -117,20 +685,21 @@ ij_php_keep_first_column_comment = true ij_php_keep_indents_on_empty_lines = false ij_php_keep_line_breaks = true ij_php_keep_rparen_and_lbrace_on_one_line = true +ij_php_keep_simple_classes_in_one_line = false ij_php_keep_simple_methods_in_one_line = false ij_php_lambda_brace_style = end_of_line ij_php_license_weight = 28 ij_php_line_comment_add_space = false ij_php_line_comment_at_first_column = true ij_php_link_weight = 28 -ij_php_lower_case_boolean_const = false +ij_php_lower_case_boolean_const = true ij_php_lower_case_keywords = true -ij_php_lower_case_null_const = false +ij_php_lower_case_null_const = true ij_php_method_brace_style = next_line -ij_php_method_call_chain_wrap = off -ij_php_method_parameters_new_line_after_left_paren = false -ij_php_method_parameters_right_paren_on_new_line = false -ij_php_method_parameters_wrap = off +ij_php_method_call_chain_wrap = split_into_lines +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 = 28 ij_php_modifier_list_wrap = false ij_php_multiline_chained_calls_semicolon_on_new_line = false @@ -141,8 +710,8 @@ ij_php_package_weight = 28 ij_php_param_weight = 0 ij_php_parentheses_expression_new_line_after_left_paren = false ij_php_parentheses_expression_right_paren_on_new_line = false -ij_php_phpdoc_blank_line_before_tags = false -ij_php_phpdoc_blank_lines_around_parameters = false +ij_php_phpdoc_blank_line_before_tags = true +ij_php_phpdoc_blank_lines_around_parameters = true ij_php_phpdoc_keep_blank_lines = true ij_php_phpdoc_param_spaces_between_name_and_description = 1 ij_php_phpdoc_param_spaces_between_tag_and_type = 1 @@ -150,7 +719,7 @@ ij_php_phpdoc_param_spaces_between_type_and_name = 1 ij_php_phpdoc_use_fqcn = false ij_php_phpdoc_wrap_long_lines = false ij_php_place_assignment_sign_on_next_line = false -ij_php_place_parens_for_constructor = 0 +ij_php_place_parens_for_constructor = 1 ij_php_property_read_weight = 28 ij_php_property_weight = 28 ij_php_property_write_weight = 28 @@ -233,12 +802,12 @@ 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 = mixed +ij_php_variable_naming_style = camel_case ij_php_version_weight = 28 ij_php_while_brace_force = never ij_php_while_on_new_line = false -[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, composer.lock, jest.config}] +[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] indent_size = 2 ij_json_keep_blank_lines_in_code = 1 ij_json_keep_indents_on_empty_lines = false @@ -250,3 +819,39 @@ ij_json_space_before_comma = false ij_json_spaces_within_braces = false ij_json_spaces_within_brackets = false ij_json_wrap_long_lines = false + +[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}] +ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3 +ij_html_align_attributes = true +ij_html_align_text = false +ij_html_attribute_wrap = normal +ij_html_block_comment_at_first_column = true +ij_html_do_not_align_children_of_min_lines = 0 +ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p +ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot +ij_html_enforce_quotes = false +ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var +ij_html_keep_blank_lines = 2 +ij_html_keep_indents_on_empty_lines = false +ij_html_keep_line_breaks = true +ij_html_keep_line_breaks_in_text = true +ij_html_keep_whitespaces = false +ij_html_keep_whitespaces_inside = span,pre,textarea +ij_html_line_comment_at_first_column = true +ij_html_new_line_after_last_attribute = never +ij_html_new_line_before_first_attribute = never +ij_html_quote_style = double +ij_html_remove_new_line_before_tags = br +ij_html_space_after_tag_name = false +ij_html_space_around_equality_in_attribute = false +ij_html_space_inside_empty_tag = false +ij_html_text_wrap = normal +ij_html_uniform_ident = false + +[{*.yaml,*.yml}] +indent_size = 2 +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_space_before_colon = true +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/.travis.yml b/.travis.yml index b96e171..c65e2bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,57 +1,60 @@ language: php php: - - 7.4 - - nightly + - 7.4 + - 8.0 services: - - mysql + - mysql + +before_script: + # Additional PHP config + - phpenv config-add ./tests/travis.php.ini before_install: - # Turn off XDebug - - phpenv config-rm xdebug.ini || return 0 + # Turn off XDebug + - phpenv config-rm xdebug.ini || return 0 install: - # Install dependencies - - rm composer.lock - - travis_retry composer install --no-progress --prefer-dist + # Install dependencies + - travis_retry composer install --no-progress --prefer-dist script: - # Tests - - make tests + # Tests + - make tests after_failure: - # Print *.actual content - - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done + # Print *.actual content + - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done jobs: - include: - - stage: Quality Assurance - php: 7.4 - script: - - make qa - - - stage: Test Coverage - if: branch = master AND type = push - php: 7.4 - script: - - make coverage - after_script: - - composer require php-coveralls/php-coveralls ^2.1.0 - - vendor/bin/php-coveralls --verbose --config tests/.coveralls.yml - - - stage: Outdated Dependencies - if: branch = master AND type = cron - php: 7.4 - script: - - composer outdated --direct - - allow_failures: - - stage: Test Coverage - - php: nightly + include: + - stage: Quality Assurance + php: 7.4 + script: + - make qa + + - stage: Test Coverage + if: branch = master AND type = push + php: 7.4 + script: + - make coverage + after_script: + - composer require php-coveralls/php-coveralls ^2.1.0 + - vendor/bin/php-coveralls --verbose --config tests/.coveralls.yml + + - stage: Outdated Dependencies + if: branch = master AND type = cron + php: 7.4 + script: + - composer outdated --direct + + allow_failures: + - stage: Test Coverage + - php: 8.0 sudo: false cache: - directories: - - $HOME/.composer/cache + directories: + - $HOME/.composer/cache diff --git a/composer.lock b/composer.lock index d5d52df..13950b5 100644 --- a/composer.lock +++ b/composer.lock @@ -1715,12 +1715,12 @@ "source": { "type": "git", "url": "https://github.com/FastyBird/bootstrap.git", - "reference": "f3725cfe19267c4bc00cfda0437f023dc67add4c" + "reference": "c1ce22b1c64fb2f62054ceb88d6e4e9c4f36cc82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FastyBird/bootstrap/zipball/f3725cfe19267c4bc00cfda0437f023dc67add4c", - "reference": "f3725cfe19267c4bc00cfda0437f023dc67add4c", + "url": "https://api.github.com/repos/FastyBird/bootstrap/zipball/c1ce22b1c64fb2f62054ceb88d6e4e9c4f36cc82", + "reference": "c1ce22b1c64fb2f62054ceb88d6e4e9c4f36cc82", "shasum": "" }, "require": { @@ -1730,7 +1730,7 @@ "nette/bootstrap": "^3.0", "nette/di": "^3.0", "nette/utils": "^3.0", - "php": ">=7.3.0", + "php": ">=7.4.0", "sentry/sdk": "^2.1" }, "require-dev": { @@ -1765,7 +1765,7 @@ "authors": [ { "name": "FastyBird s.r.o.", - "email": "info@fastybird.com", + "email": "code@fastybird.com", "homepage": "https://www.fastybird.com/" }, { @@ -1773,20 +1773,21 @@ "email": "adam.kadlec@fastybird.com" } ], - "description": "FastyBird bootstrap for applications", + "description": "FastyBird application bootstrap", "homepage": "https://www.fastybird.com", "keywords": [ "bootstrap", "fastybird", "fb", "library", - "libs" + "libs", + "nette" ], "support": { "issues": "https://github.com/FastyBird/bootstrap/issues", "source": "https://github.com/FastyBird/bootstrap/tree/master" }, - "time": "2020-12-03T16:17:12+00:00" + "time": "2020-12-07T20:54:14+00:00" }, { "name": "fastybird/database", @@ -1794,19 +1795,18 @@ "source": { "type": "git", "url": "https://github.com/FastyBird/database.git", - "reference": "e4ebcf74369d63e89ea9c8eb68ede94f2179f6a1" + "reference": "97c5a1b56074ac95caea5cb27903b444e2ca84d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FastyBird/database/zipball/e4ebcf74369d63e89ea9c8eb68ede94f2179f6a1", - "reference": "e4ebcf74369d63e89ea9c8eb68ede94f2179f6a1", + "url": "https://api.github.com/repos/FastyBird/database/zipball/97c5a1b56074ac95caea5cb27903b444e2ca84d5", + "reference": "97c5a1b56074ac95caea5cb27903b444e2ca84d5", "shasum": "" }, "require": { "fastybird/web-server": "@dev", "ipub/doctrine-crud": "^2.3", "ipub/doctrine-orm-query": "^0.0.6", - "nette/bootstrap": "^3.0", "nette/di": "^3.0", "nette/utils": "^3.0", "nettrine/cache": "^0.2", @@ -1842,7 +1842,7 @@ "authors": [ { "name": "FastyBird s.r.o.", - "email": "info@fastybird.com", + "email": "code@fastybird.com", "homepage": "https://www.fastybird.com/" }, { @@ -1866,7 +1866,7 @@ "issues": "https://github.com/FastyBird/database/issues", "source": "https://github.com/FastyBird/database/tree/master" }, - "time": "2020-12-03T19:55:23+00:00" + "time": "2020-12-07T20:55:59+00:00" }, { "name": "fastybird/json-api", @@ -1874,12 +1874,12 @@ "source": { "type": "git", "url": "https://github.com/FastyBird/json-api.git", - "reference": "2dd8d99fc5154a028ba23fc82e8d33158423995c" + "reference": "2f118a9e1e4d00d3d15381bbccd30ee61d7dabe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FastyBird/json-api/zipball/2dd8d99fc5154a028ba23fc82e8d33158423995c", - "reference": "2dd8d99fc5154a028ba23fc82e8d33158423995c", + "url": "https://api.github.com/repos/FastyBird/json-api/zipball/2f118a9e1e4d00d3d15381bbccd30ee61d7dabe4", + "reference": "2f118a9e1e4d00d3d15381bbccd30ee61d7dabe4", "shasum": "" }, "require": { @@ -1924,7 +1924,7 @@ "authors": [ { "name": "FastyBird s.r.o.", - "email": "info@fastybird.com", + "email": "code@fastybird.com", "homepage": "https://www.fastybird.com/" }, { @@ -1932,7 +1932,7 @@ "email": "adam.kadlec@fastybird.com" } ], - "description": "FastyBird {JSON:API} api utils with data hydration", + "description": "FastyBird {JSON:API} api tools with data hydration", "homepage": "https://www.fastybird.com", "keywords": [ "api", @@ -1946,7 +1946,7 @@ "issues": "https://github.com/FastyBird/json-api/issues", "source": "https://github.com/FastyBird/json-api/tree/master" }, - "time": "2020-12-03T19:40:55+00:00" + "time": "2020-12-07T20:54:54+00:00" }, { "name": "fastybird/modules-metadata", @@ -1954,12 +1954,12 @@ "source": { "type": "git", "url": "https://github.com/FastyBird/modules-metadata.git", - "reference": "ad989d1c8a635c014645b40f8f2b610a7773315d" + "reference": "e3d7b257ae4ab278e9d332f219932f0b7c42e20f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FastyBird/modules-metadata/zipball/ad989d1c8a635c014645b40f8f2b610a7773315d", - "reference": "ad989d1c8a635c014645b40f8f2b610a7773315d", + "url": "https://api.github.com/repos/FastyBird/modules-metadata/zipball/e3d7b257ae4ab278e9d332f219932f0b7c42e20f", + "reference": "e3d7b257ae4ab278e9d332f219932f0b7c42e20f", "shasum": "" }, "require": { @@ -1995,7 +1995,7 @@ "authors": [ { "name": "FastyBird s.r.o.", - "email": "info@fastybird.com", + "email": "code@fastybird.com", "homepage": "https://www.fastybird.com/" }, { @@ -2017,7 +2017,7 @@ "issues": "https://github.com/FastyBird/modules-metadata/issues", "source": "https://github.com/FastyBird/modules-metadata/tree/master" }, - "time": "2020-12-05T15:52:56+00:00" + "time": "2020-12-07T21:00:09+00:00" }, { "name": "fastybird/web-server", @@ -2025,12 +2025,12 @@ "source": { "type": "git", "url": "https://github.com/FastyBird/web-server.git", - "reference": "50800ca46791df55b048c20ab9532cee4ca3ffaa" + "reference": "8028e84e1c7a1711136bac922d9b1b42366c9c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FastyBird/web-server/zipball/50800ca46791df55b048c20ab9532cee4ca3ffaa", - "reference": "50800ca46791df55b048c20ab9532cee4ca3ffaa", + "url": "https://api.github.com/repos/FastyBird/web-server/zipball/8028e84e1c7a1711136bac922d9b1b42366c9c1b", + "reference": "8028e84e1c7a1711136bac922d9b1b42366c9c1b", "shasum": "" }, "require": { @@ -2068,7 +2068,7 @@ "authors": [ { "name": "FastyBird s.r.o.", - "email": "info@fastybird.com", + "email": "code@fastybird.com", "homepage": "https://www.fastybird.com/" }, { @@ -2091,7 +2091,7 @@ "issues": "https://github.com/FastyBird/web-server/issues", "source": "https://github.com/FastyBird/web-server/tree/master" }, - "time": "2020-12-05T15:06:38+00:00" + "time": "2020-12-07T21:46:15+00:00" }, { "name": "fig/http-message-util", @@ -8725,16 +8725,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.58", + "version": "0.12.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5" + "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a4847df6047b30af28854ed9dc95304cdb56ae5", - "reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cf4107257c8ca2ad967efdd6a00f12b21acbb779", + "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779", "shasum": "" }, "require": { @@ -8765,7 +8765,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.58" + "source": "https://github.com/phpstan/phpstan/tree/0.12.59" }, "funding": [ { @@ -8781,7 +8781,7 @@ "type": "tidelift" } ], - "time": "2020-11-29T13:32:03+00:00" + "time": "2020-12-07T14:46:03+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/patches/doctrine.orm.uuid.diff b/patches/doctrine.orm.uuid.diff index 592926b..f457fd0 100644 --- a/patches/doctrine.orm.uuid.diff +++ b/patches/doctrine.orm.uuid.diff @@ -1,5 +1,5 @@ diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php -index ea1f2efee..b09f58605 100644 +index da809358d..260610f27 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -37,6 +37,7 @@ use Doctrine\ORM\Query; @@ -10,7 +10,7 @@ index ea1f2efee..b09f58605 100644 use function array_map; use function array_merge; use function assert; -@@ -573,6 +574,15 @@ class BasicEntityPersister implements EntityPersister +@@ -577,6 +578,15 @@ class BasicEntityPersister implements EntityPersister { $class = $this->class; $identifier = $this->em->getUnitOfWork()->getEntityIdentifier($entity); @@ -26,11 +26,8 @@ index ea1f2efee..b09f58605 100644 $tableName = $this->quoteStrategy->getTableName($class, $this->platform); $idColumns = $this->quoteStrategy->getIdentifierColumnNames($class, $this->platform); $id = array_combine($idColumns, $identifier); - -warning: LF will be replaced by CRLF in lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php. -The file will have its original line endings in your working directory. diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php -index 1f6d40133..0a3d080a8 100644 +index 65e1b4efb..fabe49bb0 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -26,6 +26,7 @@ use Doctrine\DBAL\Types\Type; @@ -39,13 +36,12 @@ index 1f6d40133..0a3d080a8 100644 use Doctrine\ORM\Utility\PersisterHelper; +use Ramsey\Uuid\Uuid; - /** - * The joined subclass persister maps a single entity instance to several tables in the -@@ -271,7 +272,16 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister + use function array_combine; + +@@ -273,6 +274,15 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister public function delete($entity) { $identifier = $this->em->getUnitOfWork()->getEntityIdentifier($entity); -- $id = array_combine($this->class->getIdentifierColumnNames(), $identifier); + + foreach ($identifier as $key=>$value) { + if ($value instanceof Uuid) { @@ -55,10 +51,6 @@ index 1f6d40133..0a3d080a8 100644 + } + } + -+ $id = array_combine($this->class->getIdentifierColumnNames(), $identifier); - - $this->deleteJoinTableRecords($identifier); - + $id = array_combine($this->class->getIdentifierColumnNames(), $identifier); -warning: LF will be replaced by CRLF in lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php. -The file will have its original line endings in your working directory. + $this->deleteJoinTableRecords($identifier); \ No newline at end of file diff --git a/tests/travis.php.ini b/tests/travis.php.ini new file mode 100644 index 0000000..92a5ffd --- /dev/null +++ b/tests/travis.php.ini @@ -0,0 +1 @@ +memory_limit = 2048M