Skip to content

Commit c1c60bb

Browse files
committed
Merge branch 'main' of github.com:laracraft-tech/laravel-useful-additions
# Conflicts: # .github/workflows/run-tests.yml
2 parents f5b00aa + b59a35d commit c1c60bb

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.5.1
16+
uses: dependabot/fetch-metadata@v1.6.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
name: Check & fix styling
1+
name: Fix PHP code style issues
22

3-
on: [push]
3+
on:
4+
push:
5+
paths:
6+
- '**.php'
7+
8+
permissions:
9+
contents: write
410

511
jobs:
6-
php-cs-fixer:
12+
php-code-styling:
713
runs-on: ubuntu-latest
814

915
steps:
1016
- name: Checkout code
11-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1218
with:
1319
ref: ${{ github.head_ref }}
1420

15-
- name: Run PHP CS Fixer
16-
uses: docker://oskarstark/php-cs-fixer-ga
17-
with:
18-
args: --config=.php-cs-fixer.dist.php --allow-risky=yes
21+
- name: Fix PHP code style issues
22+
uses: aglipanci/[email protected]
1923

2024
- name: Commit changes
21-
uses: stefanzweifel/git-auto-commit-action@v4
25+
uses: stefanzweifel/git-auto-commit-action@v5
2226
with:
2327
commit_message: Fix styling

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout code
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
- name: Setup PHP
4545
uses: shivammathur/setup-php@v2

.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
ref: main
1616

.php-cs-fixer.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"php":"8.2.3","version":"3.15.1","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Traits\/RefreshDatabaseFast.php":"5367d7ee0914efa56a129e0f7cdb6e0e","src\/Traits\/UsefulScopes.php":"3131e2387cae1478f33973ec3b85bec7","src\/Traits\/UsefulEnums.php":"9ee34a74be9a41bb753790b7a513a764","src\/LaravelUsefulAdditionsServiceProvider.php":"8bfb9b0301533f1fdd57308cc4359447","src\/Commands\/DBTruncateCommand.php":"d3f4ade18bc07c116eeb981fbc484967","tests\/TestCase.php":"d0485c2a1c2f0610ad4a2a3e8bbc797a","tests\/Models\/ScopeTest.php":"20fcff52f81ffe5240c8330df047af85","tests\/PaymentType.php":"dd316a49c969685d0f504a4d587ea1b4","tests\/ScopeTest.php":"6f8d432614a39ebcb6922b16bc8ebf67","tests\/Pest.php":"f27c458472f5627f6961730801eb0ab0","tests\/EnumTest.php":"64db599d15c3b3eb5dbf76cbfa4222a7"}}
1+
{"php":"8.2.10","version":"3.26.1","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"curly_braces_position":{"allow_single_line_empty_anonymous_classes":true},"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/LaravelUsefulAdditionsServiceProvider.php":"8bfb9b0301533f1fdd57308cc4359447","src\/Commands\/DBTruncateCommand.php":"d3f4ade18bc07c116eeb981fbc484967","src\/Traits\/RefreshDatabaseFast.php":"5367d7ee0914efa56a129e0f7cdb6e0e","src\/Traits\/UsefulScopes.php":"3131e2387cae1478f33973ec3b85bec7","src\/Traits\/UsefulEnums.php":"9ee34a74be9a41bb753790b7a513a764","tests\/Pest.php":"f27c458472f5627f6961730801eb0ab0","tests\/TestCase.php":"d0485c2a1c2f0610ad4a2a3e8bbc797a","tests\/ScopeTest.php":"6f8d432614a39ebcb6922b16bc8ebf67","tests\/EnumTest.php":"64db599d15c3b3eb5dbf76cbfa4222a7","tests\/PaymentType.php":"dd316a49c969685d0f504a4d587ea1b4","tests\/Models\/ScopeTest.php":"20fcff52f81ffe5240c8330df047af85"}}

0 commit comments

Comments
 (0)