Skip to content

Commit ea20f3a

Browse files
Merge pull request #42 from worksome/2.x_laravel_10
[2.x] chore(deps): Add Laravel 10 support to v2
2 parents 5901679 + e1deebe commit ea20f3a

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

.github/workflows/run-tests.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [2.x]
66
pull_request:
7-
branches: [main]
7+
branches: [2.x]
88

99
jobs:
1010
test:
@@ -16,14 +16,21 @@ jobs:
1616
max-parallel: 1
1717
matrix:
1818
os: [ubuntu-latest, windows-latest]
19-
php: [8.0, 8.1]
20-
laravel: [8.*, 9.*]
19+
php: [8.0, 8.1, 8.2]
20+
laravel: [8.*, 9.*, 10.*]
2121
stability: [prefer-lowest, prefer-stable]
2222
include:
2323
- laravel: 8.*
24-
testbench: ^6.23
24+
testbench: ^6.25.1
2525
- laravel: 9.*
26-
testbench: ^7.0
26+
testbench: ^7.22
27+
- laravel: 10.*
28+
testbench: ^8.0
29+
exclude:
30+
- laravel: 10.*
31+
php: 8.0
32+
- laravel: 8.*
33+
php: 8.2
2734

2835
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2936

@@ -46,6 +53,7 @@ jobs:
4653
- name: Install dependencies
4754
run: |
4855
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
56+
composer remove --dev "worksome/coding-style" --no-interaction --no-update
4957
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5058
5159
- name: Execute tests

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.0 || ^8.1",
20-
"illuminate/contracts": "^8.0 || ^9.0"
19+
"php": "^8.0",
20+
"illuminate/contracts": "^8.0 || ^9.0 || ^10.0"
2121
},
2222
"require-dev": {
2323
"nunomaduro/collision": "^5.10 || ^6.0",
2424
"nunomaduro/larastan": "^1.0 || ^2.0",
25-
"orchestra/testbench": "^6.22 || ^7.0",
25+
"orchestra/testbench": "^6.22 || ^7.0 || ^8.0",
2626
"pestphp/pest": "^1.21",
27-
"pestphp/pest-plugin-laravel": "^1.1",
28-
"worksome/pest-plugin-silence": "^0.1",
27+
"pestphp/pest-plugin-laravel": "^1.4",
2928
"worksome/coding-style": "0.17.0"
3029
},
3130
"autoload": {

0 commit comments

Comments
 (0)