From 339721c7099441b37b00e518d7f6c9d7d8c2f9c1 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Thu, 6 Apr 2023 20:25:05 +0300 Subject: [PATCH 01/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4af9f7b..041fddb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Laravel Support +# Helpers for Laravel Laravel Support From 8f12d09a865759bd31eeccf8e5e5e01e0f477a44 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Thu, 6 Apr 2023 20:25:21 +0300 Subject: [PATCH 02/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041fddb..5b1de33 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Helpers for Laravel -Laravel Support +Laravel Support [![Stable Version][badge_stable]][link_packagist] [![Unstable Version][badge_unstable]][link_packagist] From a73ac4ffcc07ea8b720d923c07d7cee569243dd3 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Thu, 6 Apr 2023 20:25:31 +0300 Subject: [PATCH 03/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b1de33..1b3a5c8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Helpers for Laravel -Laravel Support +Helpers for Laravel [![Stable Version][badge_stable]][link_packagist] [![Unstable Version][badge_unstable]][link_packagist] From 23b806b01856fb4107299e10c5a976418ff0c577 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 02:59:07 +0000 Subject: [PATCH 04/10] Bump TheDragonCode/codestyler from 2.6.2 to 2.6.24 Bumps [TheDragonCode/codestyler](https://github.com/TheDragonCode/codestyler) from 2.6.2 to 2.6.24. - [Release notes](https://github.com/TheDragonCode/codestyler/releases) - [Commits](https://github.com/TheDragonCode/codestyler/compare/v2.6.2...v2.6.24) --- updated-dependencies: - dependency-name: TheDragonCode/codestyler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/code-style.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index 665db2e..2e351b1 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v2.6.2 + uses: TheDragonCode/codestyler@v2.6.24 fix: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v2.6.2 + uses: TheDragonCode/codestyler@v2.6.24 with: github_token: ${{ secrets.COMPOSER_TOKEN }} fix: true From 7886bc043adfefb3b23b4f52433c5be94e8ea1fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 03:00:09 +0000 Subject: [PATCH 05/10] Bump TheDragonCode/codestyler from 2.6.24 to 3.0.4 Bumps [TheDragonCode/codestyler](https://github.com/TheDragonCode/codestyler) from 2.6.24 to 3.0.4. - [Release notes](https://github.com/TheDragonCode/codestyler/releases) - [Commits](https://github.com/TheDragonCode/codestyler/compare/v2.6.24...v3.0.4) --- updated-dependencies: - dependency-name: TheDragonCode/codestyler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/code-style.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index 2e351b1..e313dec 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v2.6.24 + uses: TheDragonCode/codestyler@v3.0.4 fix: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v2.6.24 + uses: TheDragonCode/codestyler@v3.0.4 with: github_token: ${{ secrets.COMPOSER_TOKEN }} fix: true From 4aadf27b3336a3e2a287936408c34d3064ed6241 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 5 Jun 2023 10:06:35 +0300 Subject: [PATCH 06/10] Update code-style.yml --- .github/workflows/code-style.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index e313dec..878969b 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v3.0.4 + uses: TheDragonCode/codestyler@v3 fix: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Checking PHP Syntax - uses: TheDragonCode/codestyler@v3.0.4 + uses: TheDragonCode/codestyler@v3 with: github_token: ${{ secrets.COMPOSER_TOKEN }} fix: true From ba18e1c26132f561faafbccda11e1bb389824362 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 5 Jun 2023 07:07:31 +0000 Subject: [PATCH 07/10] =?UTF-8?q?Update=20`.editorconfig`=20=F0=9F=93=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2ccb690..f3d514f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,9 +4,9 @@ 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 = false +trim_trailing_whitespace = true ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on From d562d8214bf96265d0e9bb4fa2467c4e4cdfdcd4 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Sat, 8 Jul 2023 20:33:15 +0300 Subject: [PATCH 08/10] Added `query` method for Laravel helper --- src/Support/ModelHelper.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Support/ModelHelper.php b/src/Support/ModelHelper.php index b9a7548..1aedf91 100644 --- a/src/Support/ModelHelper.php +++ b/src/Support/ModelHelper.php @@ -3,6 +3,7 @@ namespace DragonCode\LaravelSupport\Support; use DragonCode\LaravelSupport\Exceptions\IncorrectModelException; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; class ModelHelper @@ -82,6 +83,20 @@ public function primaryKeyType($model): string ->getKeyType(); } + /** + * @param \Illuminate\Database\Eloquent\Model|string $model + * + * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException + * + * @return \Illuminate\Database\Eloquent\Builder + */ + public function query($model): Builder + { + return $this + ->model($model) + ->newQuery(); + } + /** * @param \Illuminate\Database\Eloquent\Model|string $model * From c57e049f987ff9cab52ace1745744481bf0dc2d6 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 8 Jul 2023 17:34:25 +0000 Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=A7=B9=20Fixed=20code-style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 3 +- helpers/dumper.php | 9 ++-- src/Eloquent/CompositeKeysModel.php | 4 +- .../Relations/HasManyCustomRelation.php | 7 ++- src/Support/Dumper.php | 9 ---- src/Support/ModelHelper.php | 44 ++++++------------- src/Traits/InitModelHelper.php | 2 - 7 files changed, 22 insertions(+), 56 deletions(-) diff --git a/composer.json b/composer.json index c9c5c5d..1ba509d 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,8 @@ "allow-plugins": { "dragon-code/codestyler": true, "ergebnis/composer-normalize": true, - "friendsofphp/php-cs-fixer": true + "friendsofphp/php-cs-fixer": true, + "symfony/thanks": true }, "preferred-install": "dist", "sort-packages": true diff --git a/helpers/dumper.php b/helpers/dumper.php index c5f78e6..aeadb66 100644 --- a/helpers/dumper.php +++ b/helpers/dumper.php @@ -6,8 +6,7 @@ /** * Throws a message with an SQL query. * - * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query - * @param bool $is_short + * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query */ function dd_sql($query, bool $is_short = false): void { @@ -19,8 +18,7 @@ function dd_sql($query, bool $is_short = false): void /** * Displays a message with an SQL query. * - * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query - * @param bool $is_short + * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query */ function dump_sql($query, bool $is_short = false): void { @@ -32,8 +30,7 @@ function dump_sql($query, bool $is_short = false): void /** * Displays a message with an SQL query. * - * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query - * @param bool $is_short + * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query * * @return array|string */ diff --git a/src/Eloquent/CompositeKeysModel.php b/src/Eloquent/CompositeKeysModel.php index f194ee2..319b044 100644 --- a/src/Eloquent/CompositeKeysModel.php +++ b/src/Eloquent/CompositeKeysModel.php @@ -23,8 +23,6 @@ public function getAttribute($key) if (! is_array($key)) { return parent::getAttribute($key); } - - return null; } public function find($id, $columns = ['*']) @@ -45,7 +43,7 @@ public function find($id, $columns = ['*']) } /** - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder $query * * @return \Illuminate\Database\Eloquent\Builder */ diff --git a/src/Eloquent/Relations/HasManyCustomRelation.php b/src/Eloquent/Relations/HasManyCustomRelation.php index 4dd7b91..c7657da 100644 --- a/src/Eloquent/Relations/HasManyCustomRelation.php +++ b/src/Eloquent/Relations/HasManyCustomRelation.php @@ -78,16 +78,15 @@ public function initRelation(array $models, $relation) } /** - * @param \Illuminate\Database\Eloquent\Model[] $models - * @param \Illuminate\Database\Eloquent\Collection $results - * @param string $relation + * @param array<\Illuminate\Database\Eloquent\Model> $models + * @param string $relation * * @return array */ public function match(array $models, Collection $results, $relation) { foreach ($models as $model) { - $filtered = $results->filter(function ($result) use ($model) { + $filtered = $results->filter(function ($result) use ($model) { $local = $model->getAttribute($this->local_key); $foreign = $result->getAttribute($this->getForeignKeyName()); diff --git a/src/Support/Dumper.php b/src/Support/Dumper.php index 494c7c7..ea63c6f 100644 --- a/src/Support/Dumper.php +++ b/src/Support/Dumper.php @@ -12,9 +12,6 @@ class Dumper * Throws a message with an SQL query. * * @see https://gist.github.com/Ellrion/561fc48894a87b853917e0a5cec83181#file-helper-php - * - * @param $query - * @param bool $is_short */ public function sqlDd($query, bool $is_short = false): void { @@ -28,9 +25,6 @@ public function sqlDd($query, bool $is_short = false): void * * @see https://gist.github.com/Ellrion/561fc48894a87b853917e0a5cec83181#file-helper-php * - * @param $query - * @param bool $is_short - * * @return array|string|void */ public function sqlDump($query, bool $is_short = false): void @@ -43,9 +37,6 @@ public function sqlDump($query, bool $is_short = false): void /** * Returns SQL query. * - * @param $query - * @param bool $is_short - * * @return array|string */ public function sql($query, bool $is_short = false) diff --git a/src/Support/ModelHelper.php b/src/Support/ModelHelper.php index 1aedf91..2c5a8ae 100644 --- a/src/Support/ModelHelper.php +++ b/src/Support/ModelHelper.php @@ -11,7 +11,7 @@ class ModelHelper private $models = []; /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException * @@ -25,11 +25,9 @@ public function connection($model): ?string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return string */ public function table($model): string { @@ -39,11 +37,9 @@ public function table($model): string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return string */ public function tableWithConnection($model): string { @@ -56,11 +52,9 @@ public function tableWithConnection($model): string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return string */ public function primaryKey($model): string { @@ -70,11 +64,9 @@ public function primaryKey($model): string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return string */ public function primaryKeyType($model): string { @@ -84,11 +76,9 @@ public function primaryKeyType($model): string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return \Illuminate\Database\Eloquent\Builder */ public function query($model): Builder { @@ -98,9 +88,7 @@ public function query($model): Builder } /** - * @param \Illuminate\Database\Eloquent\Model|string $model - * - * @return string + * @param \Illuminate\Database\Eloquent\Model|string $model */ public function className($model): string { @@ -108,11 +96,9 @@ public function className($model): string } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return array */ public function fillable($model): array { @@ -122,12 +108,10 @@ public function fillable($model): array } /** - * @param \Illuminate\Database\Eloquent\Model|string $model - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Http\Request $request * * @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException - * - * @return array */ public function onlyFillable($model, $request): array { @@ -137,12 +121,10 @@ public function onlyFillable($model, $request): array } /** - * @param \Illuminate\Database\Eloquent\Model|string $model - * @param string[] ...$except + * @param \Illuminate\Database\Eloquent\Model|string $model + * @param array ...$except * * @throws IncorrectModelException - * - * @return array */ public function exceptFillable($model, ...$except): array { @@ -150,7 +132,7 @@ public function exceptFillable($model, ...$except): array } /** - * @param \Illuminate\Database\Eloquent\Model|string $model + * @param \Illuminate\Database\Eloquent\Model|string $model * * @throws IncorrectModelException * diff --git a/src/Traits/InitModelHelper.php b/src/Traits/InitModelHelper.php index e11e8ed..c5c7ab5 100644 --- a/src/Traits/InitModelHelper.php +++ b/src/Traits/InitModelHelper.php @@ -12,8 +12,6 @@ trait InitModelHelper /** * @throws \Illuminate\Contracts\Container\BindingResolutionException - * - * @return \DragonCode\LaravelSupport\Support\ModelHelper */ protected function model(): ModelHelper { From 8f2ecdc50f20340a55955d0a989c588738740291 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 8 Jul 2023 17:34:25 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=93=96=20Updated=20.editorconfig=20?= =?UTF-8?q?file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.editorconfig b/.editorconfig index f3d514f..dd13df1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ indent_style = space insert_final_newline = true max_line_length = 120 tab_width = 4 -trim_trailing_whitespace = true +trim_trailing_whitespace = false ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -39,10 +39,6 @@ ij_css_space_before_opening_brace = true ij_css_use_double_quotes = true ij_css_value_alignment = do_not_align -[*.haml] -indent_size = 2 -ij_haml_keep_indents_on_empty_lines = false - [*.less] indent_size = 2 ij_less_align_closing_brace_with_properties = false @@ -232,6 +228,7 @@ 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_object_types_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 @@ -407,6 +404,7 @@ 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_object_types_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 @@ -501,7 +499,8 @@ ij_javascript_wrap_comments = false [{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}] ij_continuation_indent_size = 4 ij_php_align_assignments = true -ij_php_align_class_constants = false +ij_php_align_class_constants = true +ij_php_align_enum_cases = true ij_php_align_group_field_declarations = false ij_php_align_inline_comments = true ij_php_align_key_value_pairs = true @@ -511,13 +510,13 @@ 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 -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_named_arguments = true ij_php_align_phpdoc_comments = false ij_php_align_phpdoc_param_names = false -ij_php_anonymous_brace_style = next_line +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 @@ -533,7 +532,8 @@ ij_php_blank_lines_after_imports = 1 ij_php_blank_lines_after_opening_tag = 1 ij_php_blank_lines_after_package = 1 ij_php_blank_lines_around_class = 1 -ij_php_blank_lines_around_constants = 1 +ij_php_blank_lines_around_constants = 0 +ij_php_blank_lines_around_enum_cases = 0 ij_php_blank_lines_around_field = 1 ij_php_blank_lines_around_method = 1 ij_php_blank_lines_before_class_end = 0 @@ -543,8 +543,8 @@ ij_php_blank_lines_before_package = 1 ij_php_blank_lines_before_return_statement = 1 ij_php_blank_lines_between_imports = 1 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_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_category_weight = 28 @@ -552,6 +552,7 @@ 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_match_arm = true ij_php_comma_after_last_parameter = false ij_php_concat_spaces = true ij_php_copyright_weight = 4 @@ -561,7 +562,7 @@ ij_php_else_if_style = combine 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_extends_list_wrap = on_every_item ij_php_fields_default_visibility = protected ij_php_filesource_weight = 28 ij_php_finally_on_new_line = true @@ -569,7 +570,7 @@ 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_methods_in_one_line = false +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 @@ -588,13 +589,13 @@ 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 ij_php_keep_blank_lines_in_declarations = 0 -ij_php_keep_control_statement_in_one_line = true +ij_php_keep_control_statement_in_one_line = false ij_php_keep_first_column_comment = false 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 = true -ij_php_keep_simple_methods_in_one_line = false +ij_php_keep_simple_methods_in_one_line = true ij_php_lambda_brace_style = end_of_line ij_php_license_weight = 5 ij_php_line_comment_add_space = false @@ -622,13 +623,13 @@ ij_php_parentheses_expression_right_paren_on_new_line = 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 -ij_php_phpdoc_param_spaces_between_type_and_name = 1 +ij_php_phpdoc_param_spaces_between_name_and_description = 2 +ij_php_phpdoc_param_spaces_between_tag_and_type = 2 +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 = 0 +ij_php_place_parens_for_constructor = 1 ij_php_property_read_weight = 11 ij_php_property_weight = 10 ij_php_property_write_weight = 12 @@ -705,7 +706,7 @@ ij_php_spaces_within_parentheses = false ij_php_spaces_within_short_echo_tags = true ij_php_spaces_within_switch_parentheses = false ij_php_spaces_within_while_parentheses = false -ij_php_special_else_if_treatment = false +ij_php_special_else_if_treatment = true ij_php_subpackage_weight = 28 ij_php_ternary_operation_signs_on_next_line = true ij_php_ternary_operation_wrap = on_every_item @@ -717,12 +718,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 = snake_case +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 -[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] +[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.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 @@ -769,11 +770,17 @@ ij_html_space_around_equality_in_attribute = false 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 = normal + [{*.markdown,*.md}] 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_format_tables = 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