Skip to content

Commit d5d5ba2

Browse files
committed
Merge branch 'master' into 8.x
2 parents 82bb71f + 0ffe3d9 commit d5d5ba2

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
php: [8.1, 8.2, 8.3, 8.4]
15-
laravel: ["10.*", "11.*", "12.*"]
15+
laravel: ['10.*', '11.*', '12.*', '13.*']
1616
stability: [prefer-stable]
1717
include:
1818
- laravel: 10.*
@@ -21,11 +21,17 @@ jobs:
2121
testbench: ^9.0
2222
- laravel: 12.*
2323
testbench: ^10.0
24+
- laravel: 13.*
25+
testbench: ^11.0
2426
exclude:
2527
- php: 8.1
2628
laravel: 11.*
2729
- laravel: 12.*
2830
php: 8.1
31+
- laravel: 13.*
32+
php: 8.1
33+
- laravel: 13.*
34+
php: 8.2
2935

3036
name: PHP ${{ matrix.php }} - ${{ matrix.laravel }} - ${{ matrix.stability }}
3137

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"require": {
2424
"php": ">=8.1",
2525
"kkszymanowski/traitor": "^1.0",
26-
"laravel/framework": "^10.0|^11.0|^12.0"
26+
"laravel/framework": "^10.0|^11.0|^12.0|^13.0"
2727
},
2828
"require-dev": {
2929
"mockery/mockery": "^1.3.2",
30-
"orchestra/testbench": "^8.0|^9.0|^10.0",
31-
"phpunit/phpunit": "^8.4|^9.0|^10.5|^11.5.3"
30+
"orchestra/testbench": "^8.0|^9.0|^10.0|^11.0",
31+
"phpunit/phpunit": "^8.4|^9.0|^10.5|^11.5.3|^12.5.12"
3232
},
3333
"autoload": {
3434
"psr-4": {

0 commit comments

Comments
 (0)