Skip to content

Commit 1e65c96

Browse files
authored
Merge pull request #22 from msztorc/msztorc-l12
Adding Laravel 12 support and PHP 8.4 for tests
2 parents 5e61543 + d05d562 commit 1e65c96

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

.github/workflows/tests.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
13-
laravel: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*]
12+
php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
13+
laravel: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*, 12.*]
1414
dependency-version: [prefer-lowest, prefer-stable]
1515
include:
16+
- laravel: 12.*
17+
testbench: 10.*
1618
- laravel: 11.*
1719
testbench: 9.*
1820
- laravel: 10.*
@@ -26,6 +28,14 @@ jobs:
2628
- laravel: 6.*
2729
testbench: ^4.17
2830
exclude:
31+
- laravel: 12.*
32+
php: 8.1
33+
- laravel: 12.*
34+
php: 8.0
35+
- laravel: 12.*
36+
php: 7.4
37+
- laravel: 12.*
38+
php: 7.3
2939
- laravel: 11.*
3040
php: 8.1
3141
- laravel: 11.*
@@ -50,18 +60,25 @@ jobs:
5060
- laravel: 8.*
5161
php: 8.3
5262
dependency-version: prefer-lowest
63+
- laravel: 8.*
64+
php: 8.4
65+
dependency-version: prefer-lowest
5366
- laravel: 7.*
5467
php: 8.1
5568
- laravel: 7.*
5669
php: 8.2
5770
- laravel: 7.*
5871
php: 8.3
72+
- laravel: 7.*
73+
php: 8.4
5974
- laravel: 6.*
6075
php: 8.1
6176
- laravel: 6.*
6277
php: 8.2
6378
- laravel: 6.*
6479
php: 8.3
80+
- laravel: 6.*
81+
php: 8.4
6582

6683
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
6784

@@ -70,7 +87,7 @@ jobs:
7087
uses: actions/checkout@v2
7188

7289
- name: Cache dependencies
73-
uses: actions/cache@v1
90+
uses: actions/cache@v4
7491
with:
7592
path: ~/.composer/cache/files
7693
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
25-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
24+
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
25+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
2626
"ext-json": "*"
2727
},
2828
"autoload": {
@@ -54,7 +54,7 @@
5454
},
5555
"require-dev": {
5656
"friendsofphp/php-cs-fixer": "^2 || ^3",
57-
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
57+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
5858
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
5959
}
6060
}

0 commit comments

Comments
 (0)