Skip to content

Commit 3382b45

Browse files
authored
Merge pull request #59 from beyondcode/dev
2.3.0
2 parents 82e6368 + 7717157 commit 3382b45

File tree

3 files changed

+39
-75
lines changed

3 files changed

+39
-75
lines changed

.github/workflows/main.yml

Lines changed: 33 additions & 69 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,66 +15,37 @@ 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.4', '8.3', '8.2', '8.1', '8.0']
19+
laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
20+
dependency-version: [prefer-stable]
2921
exclude:
30-
- laravel: '11.*'
31-
php: '8.2'
32-
- laravel: '11.*'
33-
php: '8.1'
34-
- laravel: '11.*'
35-
php: '8.0'
36-
- laravel: '10.*'
37-
php: '8.0'
38-
39-
22+
- php: 8.0
23+
laravel: 10.*
24+
- php: 8.0
25+
laravel: 11.*
26+
- php: 8.0
27+
laravel: 12.*
28+
- php: 8.1
29+
laravel: 11.*
30+
- php: 8.1
31+
laravel: 12.*
32+
- php: 8.2
33+
laravel: 8.*
34+
- php: 8.3
35+
laravel: 8.*
36+
- php: 8.4
37+
laravel: 8.*
4038
include:
41-
- laravel: '11.*'
42-
php: '8.3'
43-
testbench: '9.*'
44-
- laravel: '10.*'
45-
php: '8.3'
46-
testbench: '8.*'
47-
- laravel: '10.*'
48-
php: '8.2'
49-
testbench: '8.*'
50-
- laravel: '10.*'
51-
php: '8.1'
52-
testbench: '8.*'
53-
- laravel: '9.*'
54-
php: '8.3'
55-
testbench: '7.*'
56-
- laravel: '9.*'
57-
php: '8.2'
58-
testbench: '7.*'
59-
- laravel: '9.*'
60-
php: '8.1'
61-
testbench: '7.*'
62-
- laravel: '9.*'
63-
php: '8.0'
64-
testbench: '7.*'
65-
- laravel: '8.*'
66-
php: '8.3'
67-
testbench: '6.*'
68-
- laravel: '8.*'
69-
php: '8.2'
70-
testbench: '6.*'
71-
- laravel: '8.*'
72-
php: '8.1'
73-
testbench: '6.*'
74-
- laravel: '8.*'
75-
php: '8.0'
76-
testbench: '6.*'
39+
- laravel: 8.*
40+
testbench: 6.23
41+
- laravel: 9.*
42+
testbench: 7.*
43+
- laravel: 10.*
44+
testbench: 8.*
45+
- laravel: 11.*
46+
testbench: 9.*
47+
- laravel: 12.*
48+
testbench: 10.*
7749

7850

7951
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest
@@ -90,17 +62,9 @@ jobs:
9062
coverage: none
9163

9264
- name: Install dependencies
93-
if: matrix.laravel != '11.*' || matrix.php != '8.3'
9465
run: |
9566
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
9667
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
9768
98-
- name: Install dependencies
99-
if: matrix.laravel == '11.*' && matrix.php == '8.3'
100-
run: |
101-
composer require "laravel/framework:11.*" "orchestra/testbench:9.*" --no-interaction --no-update --dev
102-
composer update --prefer-stable --prefer-dist --no-interaction
103-
104-
10569
- name: Execute tests
10670
run: vendor/bin/phpunit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ All generated vouchers can only be redeemed once. If a user tries to redeem a vo
251251
If a user tries to redeem an expired voucher code, the package will throw the following exception: `BeyondCode\Vouchers\Exceptions\VoucherExpired`.
252252

253253

254-
### Testing
254+
## Testing
255255

256256
``` bash
257257
composer test

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)