Skip to content

Commit 783182b

Browse files
authored
Merge pull request #26 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 2f1dd56 + 24edbbe commit 783182b

File tree

2 files changed

+54
-43
lines changed

2 files changed

+54
-43
lines changed

.github/workflows/main.yml

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,57 @@
11
name: run-tests
22

33
on:
4-
push:
5-
branches: [master]
6-
pull_request:
7-
branches: [master]
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
810

911
jobs:
10-
test:
11-
runs-on: ${{ matrix.os }}
12-
strategy:
13-
fail-fast: true
14-
matrix:
15-
os: [ubuntu-latest, windows-latest]
16-
php: [7.4, 8.0]
17-
laravel: [8.*]
18-
stability: [prefer-lowest, prefer-stable]
19-
include:
20-
- laravel: 8.*
21-
testbench: ^6.6
22-
23-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
24-
25-
steps:
26-
- name: Checkout code
27-
uses: actions/checkout@v2
28-
29-
- name: Setup PHP
30-
uses: shivammathur/setup-php@v2
31-
with:
32-
php-version: ${{ matrix.php }}
33-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
34-
coverage: none
35-
36-
- name: Setup problem matchers
37-
run: |
38-
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
39-
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
40-
- name: Install dependencies
41-
run: |
42-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
43-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
44-
- name: Execute tests
45-
run: vendor/bin/phpunit
12+
test:
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
fail-fast: true
17+
matrix:
18+
os: [ubuntu-latest, windows-latest]
19+
php: [7.4, 8.0, '8.2']
20+
laravel: ['8.*', '11.*']
21+
stability: [prefer-lowest, prefer-stable]
22+
include:
23+
- laravel: 8.*
24+
testbench: ^6.6
25+
- laravel: 11.*
26+
testbench: ^9.0
27+
exclude:
28+
- laravel: 11.*
29+
php: 7.4
30+
- laravel: 11.*
31+
php: 8.0
32+
33+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
34+
35+
steps:
36+
- name: Checkout code
37+
uses: actions/checkout@v2
38+
39+
- name: Setup PHP
40+
uses: shivammathur/setup-php@v2
41+
with:
42+
php-version: ${{ matrix.php }}
43+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
44+
coverage: none
45+
46+
- name: Setup problem matchers
47+
run: |
48+
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
49+
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
50+
51+
- name: Install dependencies
52+
run: |
53+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
54+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
55+
56+
- name: Execute tests
57+
run: vendor/bin/phpunit

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
],
2828
"require": {
2929
"php": "^7.4|^8.0",
30-
"illuminate/support": "^8.0|^9.0|^10.0"
30+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0"
3131
},
3232
"require-dev": {
33-
"orchestra/testbench": "^6.0|^7.0",
33+
"orchestra/testbench": "^6.0|^7.0|^9.0",
3434
"phpunit/phpunit": "^9.0|^10.0"
3535
},
3636
"autoload": {
@@ -46,7 +46,6 @@
4646
"scripts": {
4747
"test": "vendor/bin/phpunit",
4848
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
49-
5049
},
5150
"config": {
5251
"sort-packages": true

0 commit comments

Comments
 (0)