Skip to content

Commit 98f162b

Browse files
authored
Merge pull request #160 from erikn69/patch-7
Laravel 12 Support
2 parents a02cc40 + 6168162 commit 98f162b

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

Diff for: .github/workflows/php-cs-fixer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
args: --config=.php-cs-fixer.dist.php --allow-risky=yes
1919

2020
- name: Commit changes
21-
uses: stefanzweifel/git-auto-commit-action@v4
21+
uses: stefanzweifel/git-auto-commit-action@v5
2222
with:
2323
commit_message: Fix styling

Diff for: .github/workflows/run-tests.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest, windows-latest]
12-
php: [8.0, 8.1, 8.2]
13-
laravel: [11.*, 10.*, 9.*]
12+
php: [8.0, 8.1, 8.2, 8.3, 8.4]
13+
laravel: [12.*, 11.*, 10.*, 9.*]
1414
stability: [prefer-lowest, prefer-stable]
1515
include:
1616
- laravel: 9.*
@@ -19,13 +19,19 @@ jobs:
1919
testbench: 8.*
2020
- laravel: 11.*
2121
testbench: 9.*
22+
- laravel: 12.*
23+
testbench: 10.*
2224
exclude:
2325
- laravel: 10.*
2426
php: 8.0
2527
- laravel: 11.*
2628
php: 8.0
2729
- laravel: 11.*
2830
php: 8.1
31+
- laravel: 12.*
32+
php: 8.0
33+
- laravel: 12.*
34+
php: 8.1
2935

3036
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3137

@@ -45,9 +51,14 @@ jobs:
4551
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
4652
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4753
54+
- name: Fix dependencies
55+
if: ${{ startsWith(matrix.laravel, '9') }}
56+
run: |
57+
composer require "nesbot/carbon:^2.72.6" --no-interaction --no-update
58+
4859
- name: Install dependencies
4960
run: |
50-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:^2.72.2" --no-interaction --no-update
61+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5162
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5263
5364
- name: Execute tests

Diff for: .github/workflows/update-changelog.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
release-notes: ${{ github.event.release.body }}
2222

2323
- name: Commit updated CHANGELOG
24-
uses: stefanzweifel/git-auto-commit-action@v4
24+
uses: stefanzweifel/git-auto-commit-action@v5
2525
with:
2626
branch: main
2727
commit_message: Update CHANGELOG

Diff for: composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
],
1717
"require": {
1818
"php": "^8.0",
19-
"illuminate/contracts": "^9.28|^10.0|^11.0"
19+
"illuminate/contracts": "^9.28|^10.0|^11.0|^12.0"
2020
},
2121
"require-dev": {
2222
"mockery/mockery": "^1.5",
23-
"orchestra/testbench": "^7.7|^8.0|^9.0",
24-
"pestphp/pest": "^1.22|^2",
25-
"phpunit/phpunit": "^9.5.24|^10.5",
23+
"orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
24+
"pestphp/pest": "^1.23|^2.1|^3.1",
25+
"phpunit/phpunit": "^9.5.24|^10.5|^11.5",
2626
"spatie/pest-plugin-test-time": "^1.1|^2.2"
2727
},
2828
"autoload": {

0 commit comments

Comments
 (0)