Skip to content

Commit 440c75f

Browse files
authored
Merge pull request #58 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 82e6368 + dc8e0a3 commit 440c75f

File tree

2 files changed

+49
-54
lines changed

2 files changed

+49
-54
lines changed

.github/workflows/main.yml

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
7-
branches: [master]
8-
8+
branches:
9+
- master
910

1011
jobs:
1112
php-tests:
@@ -14,67 +15,62 @@ jobs:
1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
php:
18-
- '8.3'
19-
- '8.2'
20-
- '8.1'
21-
- '8.0'
22-
laravel:
23-
- '10.*'
24-
- '9.*'
25-
- '8.*'
26-
dependency-version:
27-
- 'prefer-stable'
28-
18+
php: ['8.3', '8.2', '8.1', '8.0']
19+
laravel: ['8.*', '9.*', '10.*', '12.*']
20+
dependency-version: [prefer-stable]
2921
exclude:
30-
- laravel: '11.*'
22+
- laravel: 11.*
3123
php: '8.2'
32-
- laravel: '11.*'
24+
- laravel: 11.*
3325
php: '8.1'
34-
- laravel: '11.*'
26+
- laravel: 11.*
3527
php: '8.0'
36-
- laravel: '10.*'
28+
- laravel: 10.*
29+
php: '8.0'
30+
- laravel: 12.*
31+
php: '8.1'
32+
- laravel: 12.*
3733
php: '8.0'
38-
39-
4034
include:
41-
- laravel: '11.*'
35+
- laravel: 11.*
4236
php: '8.3'
43-
testbench: '9.*'
44-
- laravel: '10.*'
37+
testbench: 9.*
38+
- laravel: 10.*
4539
php: '8.3'
46-
testbench: '8.*'
47-
- laravel: '10.*'
40+
testbench: 8.*
41+
- laravel: 10.*
4842
php: '8.2'
49-
testbench: '8.*'
50-
- laravel: '10.*'
43+
testbench: 8.*
44+
- laravel: 10.*
5145
php: '8.1'
52-
testbench: '8.*'
53-
- laravel: '9.*'
46+
testbench: 8.*
47+
- laravel: 9.*
5448
php: '8.3'
55-
testbench: '7.*'
56-
- laravel: '9.*'
49+
testbench: 7.*
50+
- laravel: 9.*
5751
php: '8.2'
58-
testbench: '7.*'
59-
- laravel: '9.*'
52+
testbench: 7.*
53+
- laravel: 9.*
6054
php: '8.1'
61-
testbench: '7.*'
62-
- laravel: '9.*'
55+
testbench: 7.*
56+
- laravel: 9.*
6357
php: '8.0'
64-
testbench: '7.*'
65-
- laravel: '8.*'
58+
testbench: 7.*
59+
- laravel: 8.*
6660
php: '8.3'
67-
testbench: '6.*'
68-
- laravel: '8.*'
61+
testbench: 6.*
62+
- laravel: 8.*
6963
php: '8.2'
70-
testbench: '6.*'
71-
- laravel: '8.*'
64+
testbench: 6.*
65+
- laravel: 8.*
7266
php: '8.1'
73-
testbench: '6.*'
74-
- laravel: '8.*'
67+
testbench: 6.*
68+
- laravel: 8.*
7569
php: '8.0'
76-
testbench: '6.*'
77-
70+
testbench: 6.*
71+
- laravel: 12.*
72+
php: '8.2'
73+
testbench: 10.*
7874

7975
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest
8076

@@ -90,17 +86,16 @@ jobs:
9086
coverage: none
9187

9288
- name: Install dependencies
93-
if: matrix.laravel != '11.*' || matrix.php != '8.3'
89+
if: "matrix.laravel != '11.*' || matrix.php != '8.3'"
9490
run: |
9591
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
9692
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
9793
9894
- name: Install dependencies
99-
if: matrix.laravel == '11.*' && matrix.php == '8.3'
95+
if: "matrix.laravel == '11.*' && matrix.php == '8.3'"
10096
run: |
10197
composer require "laravel/framework:11.*" "orchestra/testbench:9.*" --no-interaction --no-update --dev
10298
composer update --prefer-stable --prefer-dist --no-interaction
10399
104-
105100
- name: Execute tests
106101
run: vendor/bin/phpunit

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": "^7.1|^8.0",
20-
"illuminate/config": "^8.0|^9.0|^10.0|^11.0",
21-
"illuminate/database": "^8.0|^9.0|^10.0|^11.0",
22-
"illuminate/support": "^8.0|^9.0|^10.0|^11.0"
20+
"illuminate/config": "^8.0|^9.0|^10.0|^11.0|^12.0",
21+
"illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0",
22+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
2323
},
2424
"require-dev": {
2525
"mockery/mockery": "^1.4",
26-
"phpunit/phpunit": "^8.0|^9.0|^10.0",
27-
"orchestra/testbench": "^6.0|^8.0|^9.0"
26+
"phpunit/phpunit": "^8.0|^9.0|^10.0|^11.5.3",
27+
"orchestra/testbench": "^6.0|^8.0|^9.0|^10.0"
2828
},
2929
"autoload": {
3030
"psr-4": {

0 commit comments

Comments
 (0)