Skip to content

Commit 71b809c

Browse files
committed
Merge branch 'hotfix/6.0.45'
* hotfix/6.0.45: compiled assets use $casts instead of $dates fixing tests fixing tests fixing tests explicitely require testbench versions support for Laravel 10
2 parents ac62b14 + 4789fb3 commit 71b809c

File tree

11 files changed

+1002
-966
lines changed

11 files changed

+1002
-966
lines changed

.github/workflows/tests.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
php: [7.3, 7.4, 8.0, 8.1]
19-
laravel: [^6.0, ^7.0, ^8.0, ^9.0]
18+
php: [7.3, 7.4, 8.0, 8.1, 8.2]
19+
laravel: [^6.0, ^7.0, ^8.0, ^9.0, ^10.0]
2020
include:
2121
- laravel: ^6.0
2222
testbench: ^4.0
@@ -26,15 +26,27 @@ jobs:
2626
testbench: ^6.0
2727
- laravel: ^9.0
2828
testbench: ^7.0
29+
- laravel: ^10.0
30+
testbench: ^8.0
2931
exclude:
3032
- php: 7.3
3133
laravel: ^9.0
34+
- php: 7.3
35+
laravel: ^10.0
3236
- php: 7.4
3337
laravel: ^9.0
38+
- php: 7.4
39+
laravel: ^10.0
40+
- php: 8.0
41+
laravel: ^10.0
3442
- php: 8.1
3543
laravel: ^6.0
3644
- php: 8.1
3745
laravel: ^7.0
46+
- php: 8.2
47+
laravel: ^6.0
48+
- php: 8.2
49+
laravel: ^7.0
3850

3951
name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
4052

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"require": {
2424
"php": "^7.3|^8.0",
2525
"ext-json": "*",
26-
"laravel/framework": "^6.0|^7.0|^8.0|^9.0"
26+
"laravel/framework": "^6.0|^7.0|^8.0|^9.0|^10.0"
2727
},
2828
"require-dev": {
2929
"laravel/legacy-factories": "^1.0",
3030
"mockery/mockery": "^1.4",
31-
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
31+
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
3232
"phpunit/phpunit": "^9.0"
3333
},
3434
"autoload": {

0 commit comments

Comments
 (0)