Skip to content

Commit d660ac4

Browse files
authored
Merge pull request #123 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 72f0786 + b9ad026 commit d660ac4

File tree

2 files changed

+61
-57
lines changed

2 files changed

+61
-57
lines changed

.github/workflows/run-tests.yml

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,57 @@
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]
12-
php: [8.0, 8.1, 8.2]
13-
laravel: [9.*, 8.*, 10.*]
14-
stability: [prefer-stable]
15-
exclude:
16-
- php: 8.0
17-
laravel: 10.*
18-
- php: 8.2
19-
laravel: 8.*
20-
include:
21-
- laravel: 10.*
22-
testbench: 8.*
23-
- laravel: 9.*
24-
testbench: 7.*
25-
- laravel: 8.*
26-
testbench: 6.23
27-
28-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
29-
30-
steps:
31-
- name: Checkout code
32-
uses: actions/checkout@v2
33-
34-
- name: Setup PHP
35-
uses: shivammathur/setup-php@v2
36-
with:
37-
php-version: ${{ matrix.php }}
38-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
39-
coverage: none
40-
41-
# - name: Setup problem matchers
42-
# run: |
43-
# echo "::add-matcher::${{ runner.tool_cache }}/php.json"
44-
# echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
45-
#
46-
- name: Install dependencies
47-
run: |
48-
composer install
49-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
50-
composer update --${{ matrix.stability }} --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: false
13+
matrix:
14+
os: [ubuntu-latest]
15+
php: [8.0, 8.1, 8.2]
16+
laravel: ['8.*', '9.*', '10.*', '11.*']
17+
stability: [prefer-stable]
18+
exclude:
19+
- php: 8.0
20+
laravel: 10.*
21+
- php: 8.2
22+
laravel: 8.*
23+
- laravel: 11.*
24+
php: 8.0
25+
- laravel: 11.*
26+
php: 8.1
27+
include:
28+
- laravel: 10.*
29+
testbench: 8.*
30+
- laravel: 9.*
31+
testbench: 7.*
32+
- laravel: 8.*
33+
testbench: 6.23
34+
- laravel: 11.*
35+
testbench: 9.*
36+
37+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v2
42+
43+
- name: Setup PHP
44+
uses: shivammathur/setup-php@v2
45+
with:
46+
php-version: ${{ matrix.php }}
47+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
48+
coverage: none
49+
50+
- name: Install dependencies
51+
run: |
52+
composer install
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0",
21-
"illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
22-
"illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0",
23-
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
24-
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
20+
"illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
21+
"illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
22+
"illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
23+
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
24+
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
2525
"willdurand/email-reply-parser": "^2.8",
26-
"zbateson/mail-mime-parser": "^1.1"
26+
"zbateson/mail-mime-parser": "^1.1|^2.4"
2727
},
2828
"require-dev": {
2929
"laminas/laminas-mail": "^2.13",
3030
"mockery/mockery": "^1.2",
31-
"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0",
32-
"phpunit/phpunit": "^7.0|^8.0|^9.3"
31+
"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0",
32+
"phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5"
3333
},
3434
"autoload": {
3535
"psr-4": {

0 commit comments

Comments
 (0)