Skip to content

Commit 79831f3

Browse files
authored
Merge pull request #116 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 420a8f6 + 4145325 commit 79831f3

File tree

2 files changed

+60
-51
lines changed

2 files changed

+60
-51
lines changed

.github/workflows/run-tests.yml

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

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
],
2424
"require": {
2525
"php": "^8.0|^8.1",
26-
"illuminate/support": "^8.71|^9.0|^10.0"
26+
"illuminate/support": "^8.71|^9.0|^10.0|^11.0"
2727
},
2828
"require-dev": {
29-
"orchestra/testbench": "^6.6|^7.0|^8.0",
30-
"pestphp/pest": "^1.22",
31-
"phpunit/phpunit": "^9.5"
29+
"orchestra/testbench": "^6.6|^7.0|^8.0|^9.0",
30+
"pestphp/pest": "^1.22|^2.34",
31+
"phpunit/phpunit": "^9.5|^10.5"
3232
},
3333
"autoload": {
3434
"psr-4": {

0 commit comments

Comments
 (0)