Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/14.x' into 14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Helldar committed Jun 30, 2022
2 parents e7ec825 + 39f4f63 commit 2f51dc1
Show file tree
Hide file tree
Showing 92 changed files with 27 additions and 211 deletions.
37 changes: 16 additions & 21 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ ij_php_align_inline_comments = true
ij_php_align_key_value_pairs = true
ij_php_align_match_arm_bodies = true
ij_php_align_multiline_array_initializer_expression = true
ij_php_align_multiline_binary_operation = false
ij_php_align_multiline_binary_operation = true
ij_php_align_multiline_chained_methods = false
ij_php_align_multiline_extends_list = true
ij_php_align_multiline_for = false
Expand All @@ -524,7 +524,7 @@ ij_php_array_initializer_right_brace_on_new_line = true
ij_php_array_initializer_wrap = on_every_item
ij_php_assignment_wrap = on_every_item
ij_php_attributes_wrap = split_into_lines
ij_php_author_weight = 3
ij_php_author_weight = 4
ij_php_binary_operation_sign_on_next_line = true
ij_php_binary_operation_wrap = on_every_item
ij_php_blank_lines_after_class_header = 0
Expand All @@ -551,7 +551,7 @@ ij_php_category_weight = 28
ij_php_class_brace_style = next_line
ij_php_comma_after_last_array_element = true
ij_php_concat_spaces = true
ij_php_copyright_weight = 4
ij_php_copyright_weight = 28
ij_php_deprecated_weight = 0
ij_php_do_while_brace_force = always
ij_php_else_if_style = combine
Expand Down Expand Up @@ -580,7 +580,7 @@ ij_php_import_sorting = alphabetic
ij_php_indent_break_from_case = true
ij_php_indent_case_from_switch = true
ij_php_indent_code_in_php_tags = false
ij_php_internal_weight = 1
ij_php_internal_weight = 28
ij_php_keep_blank_lines_after_lbrace = 1
ij_php_keep_blank_lines_before_right_brace = 0
ij_php_keep_blank_lines_in_code = 1
Expand All @@ -593,10 +593,10 @@ ij_php_keep_rparen_and_lbrace_on_one_line = true
ij_php_keep_simple_classes_in_one_line = true
ij_php_keep_simple_methods_in_one_line = false
ij_php_lambda_brace_style = end_of_line
ij_php_license_weight = 5
ij_php_license_weight = 28
ij_php_line_comment_add_space = false
ij_php_line_comment_at_first_column = false
ij_php_link_weight = 7
ij_php_link_weight = 3
ij_php_lower_case_boolean_const = true
ij_php_lower_case_keywords = true
ij_php_lower_case_null_const = true
Expand All @@ -605,14 +605,14 @@ ij_php_method_call_chain_wrap = on_every_item
ij_php_method_parameters_new_line_after_left_paren = true
ij_php_method_parameters_right_paren_on_new_line = true
ij_php_method_parameters_wrap = on_every_item
ij_php_method_weight = 13
ij_php_method_weight = 10
ij_php_modifier_list_wrap = false
ij_php_multiline_chained_calls_semicolon_on_new_line = false
ij_php_namespace_brace_style = 2
ij_php_new_line_after_php_opening_tag = true
ij_php_null_type_position = in_the_end
ij_php_package_weight = 28
ij_php_param_weight = 9
ij_php_param_weight = 6
ij_php_parameters_attributes_wrap = split_into_lines
ij_php_parentheses_expression_new_line_after_left_paren = false
ij_php_parentheses_expression_right_paren_on_new_line = false
Expand All @@ -626,13 +626,13 @@ ij_php_phpdoc_use_fqcn = true
ij_php_phpdoc_wrap_long_lines = true
ij_php_place_assignment_sign_on_next_line = false
ij_php_place_parens_for_constructor = 0
ij_php_property_read_weight = 11
ij_php_property_weight = 10
ij_php_property_write_weight = 12
ij_php_property_read_weight = 8
ij_php_property_weight = 7
ij_php_property_write_weight = 9
ij_php_return_type_on_new_line = false
ij_php_return_weight = 15
ij_php_see_weight = 6
ij_php_since_weight = 2
ij_php_return_weight = 12
ij_php_see_weight = 2
ij_php_since_weight = 1
ij_php_sort_phpdoc_elements = true
ij_php_space_after_colon = true
ij_php_space_after_colon_in_enum_backed_type = true
Expand Down Expand Up @@ -706,16 +706,15 @@ ij_php_special_else_if_treatment = false
ij_php_subpackage_weight = 28
ij_php_ternary_operation_signs_on_next_line = true
ij_php_ternary_operation_wrap = on_every_item
ij_php_throws_weight = 14
ij_php_throws_weight = 11
ij_php_todo_weight = 28
ij_php_treat_multiline_arrays_and_lambdas_multiline = false
ij_php_unknown_tag_weight = 28
ij_php_upper_case_boolean_const = false
ij_php_upper_case_null_const = false
ij_php_uses_weight = 28
ij_php_var_weight = 28
ij_php_variable_naming_style = snake_case
ij_php_version_weight = 8
ij_php_version_weight = 5
ij_php_while_brace_force = always
ij_php_while_on_new_line = true

Expand Down Expand Up @@ -767,17 +766,13 @@ ij_markdown_force_one_space_after_blockquote_symbol = true
ij_markdown_force_one_space_after_header_symbol = true
ij_markdown_force_one_space_after_list_bullet = true
ij_markdown_force_one_space_between_words = true
ij_markdown_insert_quote_arrows_on_wrap = true
ij_markdown_keep_indents_on_empty_lines = false
ij_markdown_keep_line_breaks_inside_text_blocks = true
ij_markdown_max_lines_around_block_elements = 1
ij_markdown_max_lines_around_header = 1
ij_markdown_max_lines_between_paragraphs = 1
ij_markdown_min_lines_around_block_elements = 1
ij_markdown_min_lines_around_header = 2
ij_markdown_min_lines_between_paragraphs = 1
ij_markdown_wrap_text_if_long = true
ij_markdown_wrap_text_inside_blockquotes = true

[{*.yaml,*.yml}]
ij_yaml_align_values_properties = do_not_align
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tests/ export-ignore

.env.example export-ignore

.editorconfig
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.styleci.yml export-ignore
Expand Down
2 changes: 0 additions & 2 deletions config/private.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions config/public.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Laravel, Lumen | PHP | Package Version | Comment |
|------------------------------|-------------------------|-----------------|-------------------------------------------------------------------------------|
| 7.x, 8.x, 9.x | 8.1 | ^14.0 | ![Supported][badge_supported] [changelog 14.x](../changelog.md#_14-x) |
| 8.x, 9.x | 8.1 | ^14.0 | ![Supported][badge_supported] [changelog 14.x](../changelog.md#_14-x) |
| 7.x, 8.x, 9.x | 8.0, 8.1 | ^13.0 | ![Not Supported][badge_not_supported] [changelog 13.x](../changelog.md#_13-x) |
| 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | ^12.0 | ![Not Supported][badge_not_supported] [changelog 12.x](../changelog.md#_12-x) |
| 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | ^11.2 | ![Not Supported][badge_not_supported] [changelog 11.x](../changelog.md#_11-x) |
Expand Down
2 changes: 0 additions & 2 deletions phpunit.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Concerns/Has.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Concerns/Path.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Console/Add.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Console/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Console/Remove.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Console/Reset.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Console/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
4 changes: 1 addition & 3 deletions src/Constants/Locales.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand All @@ -22,7 +20,7 @@
use ArchTech\Enums\Values;

/**
* Based on ISO 15897
* Based on ISO 15897.
*
* @see https://laravel.com/docs/localization#introduction
*
Expand Down
2 changes: 0 additions & 2 deletions src/Exceptions/BaseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
3 changes: 0 additions & 3 deletions src/Exceptions/ProtectedLocaleException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand All @@ -30,4 +28,3 @@ public function __construct(array|string|Locales $locales)
parent::__construct("Can't delete protected locales: $locales.");
}
}

2 changes: 0 additions & 2 deletions src/Exceptions/UnknownLocaleCodeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Exceptions/UnknownPluginInstanceException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Facades/Helpers/Locales.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Helpers/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Helpers/Locales.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Plugins/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
2 changes: 0 additions & 2 deletions src/Processors/Add.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down
12 changes: 5 additions & 7 deletions src/Processors/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
* file that was distributed with this source code.
*
* @author Andrey Helldar <[email protected]>
*
* @copyright 2022 Andrey Helldar
*
* @license MIT
*
* @see https://github.com/Laravel-Lang/publisher
Expand Down Expand Up @@ -42,10 +40,10 @@ abstract class Processor

public function __construct(
readonly protected OutputStyle $output,
readonly protected array $locales,
readonly protected Config $config = new Config(),
readonly protected Manager $filesystem = new Manager(),
protected Translation $translation = new Translation()
readonly protected array $locales,
readonly protected Config $config = new Config(),
readonly protected Manager $filesystem = new Manager(),
protected Translation $translation = new Translation()
) {
}

Expand Down Expand Up @@ -122,7 +120,7 @@ protected function plugins(): array
return Arr::of($this->config->plugins())
->map(static function (array $plugins): array {
return Arr::of($plugins)
->map(static fn (string $plugin) => new $plugin)
->map(static fn (string $plugin) => new $plugin())
->filter(static fn (Plugin $plugin) => $plugin->has())
->toArray();
})
Expand Down
Loading

0 comments on commit 2f51dc1

Please sign in to comment.