Skip to content

Commit 0c31941

Browse files
authored
Merge pull request #60 from asbiin/patch-1
Support Laravel 11
2 parents 7b84d0c + ef22799 commit 0c31941

File tree

4 files changed

+31
-58
lines changed

4 files changed

+31
-58
lines changed

Diff for: .github/workflows/php-cs-fixer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
ref: ${{ github.head_ref }}
1414

Diff for: .github/workflows/tests.yml

+22-49
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: tests
22

3-
on: [ pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- 0.x
8+
pull_request:
9+
types: [opened, synchronize, reopened]
410

511
jobs:
612
test:
@@ -9,57 +15,24 @@ jobs:
915
fail-fast: true
1016
matrix:
1117
os: [ ubuntu-latest ]
12-
php: [ 7.2.5, 8.0, 8.1 ]
13-
laravel: [ 6.*, 8.*, ^9.33, 10.* ]
14-
testbench: [ ^4.0, ^6.6, ^7.0, ^8.0 ]
18+
php: [ '8.0', '8.1', '8.2', '8.3' ]
19+
laravel: [ '8.0', '9.33', '10.0', '11.0' ]
1520
stability: [ prefer-lowest, prefer-stable ]
1621
exclude:
17-
- php: 7.2.5
18-
laravel: 10.*
19-
- php: 8.0
20-
laravel: 10.*
21-
- php: 8.1
22-
laravel: 6.*
23-
- php: 7.2.5
24-
laravel: 8.*
25-
- php: 7.2.5
26-
laravel: ^9.33
27-
- php: 7.2.5
28-
testbench: ^8.0
29-
- php: 7.2.5
30-
testbench: ^6.6
31-
- php: 7.2.5
32-
testbench: ^7.0
33-
- php: 8.0
34-
testbench: ^8.0
35-
- php: 8.1
36-
testbench: ^4.0
37-
- php: 8.1
38-
testbench: ^6.6
39-
- php: 8.1
40-
testbench: ^7.0
41-
- laravel: 6.*
42-
testbench: ^6.6
43-
- laravel: 6.*
44-
testbench: ^7.0
45-
- laravel: 8.*
46-
testbench: ^4.0
47-
- laravel: 8.*
48-
testbench: ^7.0
49-
- laravel: 8.*
50-
testbench: ^8.0
51-
- laravel: ^9.33
52-
testbench: ^4.0
53-
- laravel: ^9.33
54-
testbench: ^6.6
55-
- laravel: ^9.33
56-
testbench: ^8.0
22+
- php: '8.0'
23+
laravel: '10.0'
24+
- php: '8.0'
25+
laravel: '11.0'
26+
- php: '8.1'
27+
laravel: '11.0'
28+
- laravel: '8.0'
29+
stability: prefer-lowest
5730

58-
name: php-${{ matrix.php }} - laravel-${{ matrix.laravel }} - testbench-${{ matrix.testbench }} - ${{ matrix.stability }} - ${{ matrix.os }}
31+
name: php-${{ matrix.php }} - laravel-${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
5932

6033
steps:
6134
- name: Checkout code
62-
uses: actions/checkout@v2
35+
uses: actions/checkout@v4
6336

6437
- name: Setup PHP
6538
uses: shivammathur/setup-php@v2
@@ -75,8 +48,8 @@ jobs:
7548
7649
- name: Install dependencies
7750
run: |
78-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
79-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
51+
composer require "illuminate/support:^${{ matrix.laravel }}" --no-update
52+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
8053
8154
- name: Execute tests
82-
run: vendor/bin/phpunit
55+
run: vendor/bin/phpunit --no-coverage

Diff for: .github/workflows/update-changelog.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
with:
1515
ref: 0.x
1616

Diff for: composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"require": {
1515
"php": "^7.2.5|^8.0",
1616
"ext-json": "*",
17-
"illuminate/config": "^6.0|^8.0|^9.0|^10.0",
18-
"illuminate/console": "^6.0|^8.0|^9.0|^10.0",
19-
"illuminate/support": "^6.0|^8.0|^9.0|^10.0",
20-
"illuminate/filesystem": "^6.0|^8.0|^9.0|^10.0",
21-
"symfony/finder": "^4.4|^5.1|^6.0"
17+
"illuminate/config": "^8.0|^9.0|^10.0|^11.0",
18+
"illuminate/console": "^8.0|^9.0|^10.0|^11.0",
19+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0",
20+
"illuminate/filesystem": "^8.0|^9.0|^10.0|^11.0",
21+
"symfony/finder": "^5.1|^6.0|^7.0"
2222
},
2323
"require-dev": {
2424
"mockery/mockery": "^1.3.3",
25-
"orchestra/testbench": "^4.0|^6.6|^7.0|^8.0",
26-
"phpunit/phpunit": "^8.5|^9.5"
25+
"orchestra/testbench": "^6.6|^7.0|^8.0|^9.0",
26+
"phpunit/phpunit": "^9.5|^10.0"
2727
},
2828
"autoload": {
2929
"psr-4": {

0 commit comments

Comments
 (0)