Skip to content

Commit a25d32f

Browse files
authored
Merge pull request #184 from joostdebruijn/joost/laravel-10
chore: support Laravel 10.x
2 parents 4f82143 + e50495f commit a25d32f

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

.github/workflows/tests.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,41 @@ jobs:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
php: [8.1, 8.0]
15-
laravel: [9.*, 8.*]
14+
php: [8.2, 8.1, 8.0]
15+
laravel: [10.*, 9.*, 8.*]
1616
stability: [prefer-lowest, prefer-stable]
1717
include:
18+
- laravel: 10.*
19+
testbench: 8.*
1820
- laravel: 9.*
19-
testbench: 7.*
21+
testbench: ^7.19
2022
- laravel: 8.*
2123
testbench: ^6.23
24+
exclude:
25+
# Laravel 10 doesn't support PHP 8.0
26+
- laravel: 10.*
27+
php: 8.0
28+
# Laravel 8 doesn't support PHP 8.2
29+
- laravel: 8.*
30+
php: 8.2
2231

23-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
32+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }}
2433

2534
steps:
2635
- name: Checkout code
27-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
2837

2938
- name: Get Composer cache directory
3039
id: composer-cache
3140
run: |
3241
echo "::set-output name=dir::$(composer config cache-files-dir)"
3342
34-
- uses: actions/cache@v2
43+
- uses: actions/cache@v3
3544
with:
3645
path: ${{ steps.composer-cache.outputs.dir }}
37-
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
46+
key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.stability }}-composer
3847
restore-keys: |
39-
${{ runner.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
48+
${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.stability }}-composer
4049
4150
- name: Setup PHP
4251
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
],
1414
"require": {
1515
"php": "^8.0",
16-
"illuminate/notifications": "^8.0|^9.0",
17-
"illuminate/support": "^8.0|^9.0",
16+
"illuminate/notifications": "^8.0|^9.0|^10.0",
17+
"illuminate/support": "^8.0|^9.0|^10.0",
1818
"minishlink/web-push": "^8.0"
1919
},
2020
"require-dev": {
2121
"mockery/mockery": "~1.0",
22-
"orchestra/testbench": "^6.0|^7.0",
22+
"orchestra/testbench": "^6.0|^7.0|^8.0",
2323
"phpunit/phpunit": "^9.0"
2424
},
2525
"autoload": {

0 commit comments

Comments
 (0)