Skip to content

Commit 88c10d3

Browse files
authored
Merge pull request #25 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 9813fb7 + 4278734 commit 88c10d3

File tree

2 files changed

+63
-52
lines changed

2 files changed

+63
-52
lines changed

.github/workflows/run-tests.yml

Lines changed: 60 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,64 @@
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: true
10-
matrix:
11-
os: [ubuntu-latest, windows-latest]
12-
php: [8.2, 8.0, 7.4, 7.3]
13-
laravel: [10.*, 9.*, 8.*]
14-
dependency-version: [prefer-lowest, prefer-stable]
15-
include:
16-
- laravel: 10.*
17-
testbench: 8.*
18-
- laravel: 9.*
19-
testbench: 7.*
20-
- laravel: 8.*
21-
testbench: ^6.23
22-
exclude:
23-
- laravel: 10.*
24-
php: 8
25-
- laravel: 10.*
26-
php: 7.4
27-
- laravel: 10.*
28-
php: 7.3
29-
- laravel: 9.*
30-
php: 7.4
31-
- laravel: 9.*
32-
php: 7.3
33-
34-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
35-
36-
steps:
37-
- name: Checkout code
38-
uses: actions/checkout@v3
39-
40-
- name: Setup PHP
41-
uses: shivammathur/setup-php@v2
42-
with:
43-
php-version: ${{ matrix.php }}
44-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
45-
coverage: none
46-
47-
- name: Install dependencies
48-
run: |
49-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
50-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
51-
52-
- name: Execute tests
53-
run: vendor/bin/phpunit
8+
test:
9+
runs-on: ${{ matrix.os }}
10+
11+
strategy:
12+
fail-fast: true
13+
matrix:
14+
os: [ubuntu-latest, windows-latest]
15+
php: [8.2, 8.0, 7.4, 7.3]
16+
laravel: ['8.*', '9.*', '10.*', '11.*']
17+
dependency-version: [prefer-lowest, prefer-stable]
18+
include:
19+
- laravel: 10.*
20+
testbench: 8.*
21+
- laravel: 9.*
22+
testbench: 7.*
23+
- laravel: 8.*
24+
testbench: ^6.23
25+
- laravel: 11.*
26+
testbench: 9.*
27+
exclude:
28+
- laravel: 10.*
29+
php: 8
30+
- laravel: 10.*
31+
php: 7.4
32+
- laravel: 10.*
33+
php: 7.3
34+
- laravel: 9.*
35+
php: 7.4
36+
- laravel: 9.*
37+
php: 7.3
38+
- laravel: 11.*
39+
php: 8.0
40+
- laravel: 11.*
41+
php: 7.4
42+
- laravel: 11.*
43+
php: 7.3
44+
45+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
46+
47+
steps:
48+
- name: Checkout code
49+
uses: actions/checkout@v3
50+
51+
- name: Setup PHP
52+
uses: shivammathur/setup-php@v2
53+
with:
54+
php-version: ${{ matrix.php }}
55+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
56+
coverage: none
57+
58+
- name: Install dependencies
59+
run: |
60+
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
61+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
62+
63+
- name: Execute tests
64+
run: vendor/bin/phpunit

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"prefer-stable": true,
2323
"require": {
2424
"php": "^7.2|^8.0",
25-
"illuminate/http": "^8.0|^9.0|^10"
25+
"illuminate/http": "^8.0|^9.0|^10|^11.0"
2626
},
2727
"require-dev": {
28-
"orchestra/testbench": "^6.23|^7.0|^8.0",
29-
"phpunit/phpunit": "^9.4"
28+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
29+
"phpunit/phpunit": "^9.4|^10.5"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)