Skip to content

Commit 35323b5

Browse files
committed
Update PHP and Laravel versions tested in CI, and update NPM dependencies to regenerate package-lock.json
1 parent cccc603 commit 35323b5

5 files changed

Lines changed: 1008 additions & 1229 deletions

File tree

.github/workflows/test.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
test:
1313
name: ${{ matrix.os[0] }}, PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
1414
runs-on: ${{ matrix.os[1] }}
15-
continue-on-error: ${{ matrix.php == 8.4 }}
15+
continue-on-error: ${{ matrix.php == 8.6 }}
1616
strategy:
1717
matrix:
1818
os: [[Ubuntu, ubuntu-latest], [Windows, windows-latest]]
19-
php: [8.1, 8.2, 8.3, 8.4]
20-
laravel: [9, 10, 11, 12]
19+
php: [8.2, 8.3, 8.4, 8.5, 8.6]
20+
laravel: [10, 11, 12]
2121
exclude:
22-
- php: 8.1
23-
laravel: 11
24-
- php: 8.1
25-
laravel: 12
22+
- php: 8.5
23+
laravel: 10
24+
- php: 8.6
25+
laravel: 10
2626
include:
27-
- php: 8.4
27+
- php: 8.6
2828
composer: --ignore-platform-req=php+
2929
steps:
3030
- uses: actions/checkout@v4
@@ -34,12 +34,8 @@ jobs:
3434
extensions: fileinfo
3535
- uses: actions/setup-node@v4
3636
with:
37-
node-version: 20
37+
node-version: 24
3838
cache: 'npm'
39-
- if: matrix.laravel == 9
40-
run: |
41-
composer remove laravel/folio --dev --no-update --no-interaction
42-
composer require pestphp/pest:"1.*" pestphp/pest-plugin-laravel:"1.*" phpunit/phpunit:"9.*" --dev --no-update --no-interaction
4339
- run: composer require laravel/framework:"${{ matrix.laravel }}.*" --no-update --no-interaction
4440
- uses: ramsey/composer-install@v3
4541
with:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"require-dev": {
3232
"laravel/folio": "^1.1",
33-
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0 || ^10.0",
34-
"pestphp/pest": "^2.26|^3.0",
35-
"pestphp/pest-plugin-laravel": "^2.4|^3.0"
33+
"orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
34+
"pestphp/pest": "^2.0 || ^3.0 || ^4.0",
35+
"pestphp/pest-plugin-laravel": "^2.0 || ^3.0 || ^4.0"
3636
},
3737
"autoload": {
3838
"psr-4": {

0 commit comments

Comments
 (0)