Skip to content

Commit d8b92f0

Browse files
authored
Merge pull request #54 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents b9e1a30 + e52f7f2 commit d8b92f0

File tree

2 files changed

+76
-64
lines changed

2 files changed

+76
-64
lines changed

.github/workflows/run-tests.yml

Lines changed: 68 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,78 @@
11
name: run-tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
6-
test:
7-
runs-on: ${{ matrix.os }}
8-
strategy:
9-
fail-fast: false
10-
matrix:
11-
os: [ubuntu-latest, windows-latest]
12-
php: [8.2, 8.1, 8.0, 7.4, 7.3]
13-
laravel: [10.*, 9.*, 8.*, 7.*]
14-
dependency-version: [prefer-stable]
15-
include:
16-
17-
- laravel: 10.*
18-
testbench: 8.*
19-
- laravel: 9.*
20-
testbench: 7.*
21-
- laravel: 8.*
22-
testbench: 6.*
23-
- laravel: 7.*
24-
testbench: 5.*
25-
exclude:
26-
- laravel: 10.*
27-
php: 8.0
28-
- laravel: 10.*
29-
php: 7.4
30-
- laravel: 10.*
31-
php: 7.3
32-
- laravel: 9.*
33-
php: 7.4
34-
- laravel: 9.*
35-
php: 7.3
36-
- laravel: 7.*
37-
php: 8.1
38-
- laravel: 7.*
39-
php: 8.2
8+
test:
9+
runs-on: ${{ matrix.os }}
4010

41-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
os: [ubuntu-latest, windows-latest]
15+
php: [8.2, 8.1, 8.0, 7.4, 7.3]
16+
laravel: ['7.*', '8.*', '9.*', '10.*', '11.*']
17+
dependency-version: [prefer-stable]
18+
include:
19+
- laravel: 10.*
20+
testbench: 8.*
21+
- laravel: 9.*
22+
testbench: 7.*
23+
- laravel: 8.*
24+
testbench: 6.*
25+
- laravel: 7.*
26+
testbench: 5.*
27+
- laravel: 11.*
28+
testbench: 9.*
29+
exclude:
30+
- laravel: 10.*
31+
php: 8.0
32+
- laravel: 10.*
33+
php: 7.4
34+
- laravel: 10.*
35+
php: 7.3
36+
- laravel: 9.*
37+
php: 7.4
38+
- laravel: 9.*
39+
php: 7.3
40+
- laravel: 7.*
41+
php: 8.1
42+
- laravel: 7.*
43+
php: 8.2
44+
- laravel: 11.*
45+
php: 8.1
46+
- laravel: 11.*
47+
php: 8.0
48+
- laravel: 11.*
49+
php: 7.4
50+
- laravel: 11.*
51+
php: 7.3
4252

43-
steps:
44-
- name: Checkout code
45-
uses: actions/checkout@v3
53+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
4654

47-
- name: Cache dependencies
48-
uses: actions/cache@v2
49-
with:
50-
path: ~/.composer/cache/files
51-
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
55+
steps:
56+
- name: Checkout code
57+
uses: actions/checkout@v3
5258

53-
- name: Setup PHP
54-
uses: shivammathur/setup-php@v2
55-
with:
56-
php-version: ${{ matrix.php }}
57-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
58-
coverage: none
59+
- name: Cache dependencies
60+
uses: actions/cache@v2
61+
with:
62+
path: ~/.composer/cache/files
63+
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
5964

60-
- name: Install dependencies
61-
run: |
62-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
63-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
65+
- name: Setup PHP
66+
uses: shivammathur/setup-php@v2
67+
with:
68+
php-version: ${{ matrix.php }}
69+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
70+
coverage: none
6471

65-
- name: Execute tests
66-
run: vendor/bin/pest
72+
- name: Install dependencies
73+
run: |
74+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
75+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
76+
77+
- name: Execute tests
78+
run: vendor/bin/pest

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
],
1818
"require": {
1919
"php": "^7.3|^8.0",
20-
"illuminate/auth": "^7.0|^8.0|^9.0|^10.0",
21-
"illuminate/notifications": "^7.0|^8.0|^9.0|^10.0",
22-
"illuminate/queue": "^7.0|^8.0|^9.0|^10.0"
20+
"illuminate/auth": "^7.0|^8.0|^9.0|^10.0|^11.0",
21+
"illuminate/notifications": "^7.0|^8.0|^9.0|^10.0|^11.0",
22+
"illuminate/queue": "^7.0|^8.0|^9.0|^10.0|^11.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
26-
"pestphp/pest": "^1.22",
27-
"pestphp/pest-plugin-laravel": "^1.3",
28-
"phpunit/phpunit": "^9.0",
25+
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
26+
"pestphp/pest": "^1.22|^2.34",
27+
"pestphp/pest-plugin-laravel": "^1.3|^2.3",
28+
"phpunit/phpunit": "^9.0|^10.5",
2929
"spatie/test-time": "^1.1"
3030
},
3131
"autoload": {
@@ -57,4 +57,4 @@
5757
},
5858
"minimum-stability": "dev",
5959
"prefer-stable": true
60-
}
60+
}

0 commit comments

Comments
 (0)