Skip to content

Commit 4fc9873

Browse files
authored
Merge pull request #7 from Kristories/develop
Support Laravel 10
2 parents 8243e4d + 86a9386 commit 4fc9873

File tree

2 files changed

+80
-38
lines changed

2 files changed

+80
-38
lines changed

.github/workflows/tests.yml

Lines changed: 74 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,89 @@ name: Tests
33
on:
44
push:
55
branches:
6-
- master
7-
pull_request:
8-
branches:
9-
- "*"
6+
- "**"
7+
pull_request:
8+
branches: [main]
109

1110
jobs:
1211
run-tests:
13-
runs-on: ubuntu-latest
14-
timeout-minutes: 15
15-
env:
16-
COMPOSER_NO_INTERACTION: 1
17-
12+
runs-on: ${{ matrix.os }}
13+
1814
strategy:
19-
fail-fast: false
2015
matrix:
21-
php: [8.1, 8.0]
22-
laravel: [9.*, 8.*]
23-
dependency-version: [prefer-lowest, prefer-stable]
16+
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2]
17+
laravel: [6.*, 7.*, 8.*, 9.*, 10.*]
18+
os: [ubuntu-latest]
2419
include:
20+
- laravel: 10.*
21+
testbench: 8.*
2522
- laravel: 9.*
2623
testbench: 7.*
2724
- laravel: 8.*
28-
testbench: ^6.23
25+
testbench: 6.*
26+
- laravel: 7.*
27+
testbench: 5.*
28+
- laravel: 6.*
29+
testbench: 4.*
30+
31+
exclude:
32+
- laravel: 6.*
33+
php: 7.1
34+
- laravel: 6.*
35+
php: 8.1
36+
- laravel: 6.*
37+
php: 8.2
38+
- laravel: 7.*
39+
php: 7.1
40+
- laravel: 7.*
41+
php: 8.1
42+
- laravel: 7.*
43+
php: 8.2
44+
- laravel: 8.*
45+
php: 7.1
46+
- laravel: 8.*
47+
php: 7.2
48+
- laravel: 8.*
49+
php: 8.2
50+
- laravel: 9.*
51+
php: 7.1
52+
- laravel: 9.*
53+
php: 7.2
54+
- laravel: 9.*
55+
php: 7.3
56+
- laravel: 9.*
57+
php: 7.4
58+
- laravel: 10.*
59+
php: 7.1
60+
- laravel: 10.*
61+
php: 7.2
62+
- laravel: 10.*
63+
php: 7.3
64+
- laravel: 10.*
65+
php: 7.4
66+
- laravel: 10.*
67+
php: '8.0'
2968

30-
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
69+
name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}
3170

3271
steps:
33-
- name: Checkout code
34-
uses: actions/checkout@v2
35-
36-
- name: Setup PHP
37-
uses: shivammathur/setup-php@v2
38-
with:
39-
php-version: ${{ matrix.php }}
40-
coverage: none
41-
extensions: mbstring
42-
43-
- name: Install dependencies
44-
run: |
45-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
46-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
47-
48-
- name: Execute tests
49-
run: composer test
72+
- name: Checkout code
73+
uses: actions/checkout@v3
74+
75+
- name: Setup PHP
76+
uses: shivammathur/setup-php@v2
77+
with:
78+
php-version: ${{ matrix.php }}
79+
extension: mbstring
80+
coverage: none
81+
82+
- name: Install dependencies
83+
run: |
84+
composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
85+
composer install --prefer-dist --no-interaction --no-suggest
86+
87+
- name: Installed dependencies
88+
run: composer show -D
89+
90+
- name: Execute tests
91+
run: vendor/bin/phpunit --exclude-group skipped

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^8.0",
12-
"illuminate/support": "^8|^9"
11+
"php": "^7.2|^8.0",
12+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1313
},
1414
"require-dev": {
15-
"orchestra/testbench": "^6.24|^7.0",
16-
"phpstan/phpstan": "^1.9",
17-
"laravel/pint": "^1.2",
18-
"pestphp/pest": "^1.22"
15+
"phpunit/phpunit": "^9.3",
16+
"orchestra/testbench": "^4.0 || ^6.0 || ^7.0 || ^8.0",
17+
"phpunit/phpunit": "^8.3 || ^9.0",
18+
"friendsofphp/php-cs-fixer": "^3.0"
1919
},
2020
"autoload": {
2121
"psr-4": {

0 commit comments

Comments
 (0)