Skip to content

Commit 0b8b13b

Browse files
committed
Support Laravel 11
1 parent decdf37 commit 0b8b13b

File tree

4 files changed

+39
-35
lines changed

4 files changed

+39
-35
lines changed

.github/workflows/autoformat.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
name: "Autoformat"
1+
name: Autoformat
22
on:
33
push:
44

55
jobs:
66
composer-normalize:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v4
1010
with:
1111
ref: ${{ github.head_ref }}
1212

1313
- uses: shivammathur/setup-php@v2
1414

15-
- uses: ramsey/composer-install@v2
15+
- uses: ramsey/composer-install@v3
1616

1717
- run: composer normalize
1818

@@ -23,7 +23,7 @@ jobs:
2323
prettier:
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2727
with:
2828
ref: ${{ github.head_ref }}
2929

.github/workflows/validate.yml

+28-25
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- 8.0
2424
- 8.1
2525
- 8.2
26+
- 8.3
2627
laravel-version:
2728
- 5.6.*
2829
- 5.7.*
@@ -32,6 +33,7 @@ jobs:
3233
- ^8
3334
- ^9
3435
- ^10
36+
- ^11
3537
exclude:
3638
- php-version: 7.1
3739
laravel-version: ^6
@@ -43,20 +45,28 @@ jobs:
4345
laravel-version: ^9
4446
- php-version: 7.1
4547
laravel-version: ^10
48+
- php-version: 7.1
49+
laravel-version: ^11
4650
- php-version: 7.2
4751
laravel-version: ^8
4852
- php-version: 7.2
4953
laravel-version: ^9
5054
- php-version: 7.2
5155
laravel-version: ^10
56+
- php-version: 7.2
57+
laravel-version: ^11
5258
- php-version: 7.3
5359
laravel-version: ^9
5460
- php-version: 7.3
5561
laravel-version: ^10
62+
- php-version: 7.3
63+
laravel-version: ^11
5664
- php-version: 7.4
5765
laravel-version: ^9
5866
- php-version: 7.4
5967
laravel-version: ^10
68+
- php-version: 7.4
69+
laravel-version: ^11
6070
- php-version: 8.0
6171
laravel-version: 5.6.*
6272
- php-version: 8.0
@@ -69,6 +79,8 @@ jobs:
6979
laravel-version: ^7
7080
- php-version: 8.0
7181
laravel-version: ^10
82+
- php-version: 8.0
83+
laravel-version: ^11
7284
- php-version: 8.1
7385
laravel-version: 5.6.*
7486
- php-version: 8.1
@@ -89,54 +101,45 @@ jobs:
89101
laravel-version: ^6
90102
- php-version: 8.2
91103
laravel-version: ^7
104+
- php-version: 8.3
105+
laravel-version: 5.6.*
106+
- php-version: 8.3
107+
laravel-version: 5.7.*
108+
- php-version: 8.3
109+
laravel-version: 5.8.*
110+
- php-version: 8.3
111+
laravel-version: ^6
112+
- php-version: 8.3
113+
laravel-version: ^7
92114

93115
steps:
94-
- uses: actions/checkout@v2
116+
- uses: actions/checkout@v4
95117

96118
- uses: shivammathur/setup-php@v2
97119
with:
98120
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
99121
php-version: ${{ matrix.php-version }}
100122

101-
- uses: actions/cache@v1
102-
with:
103-
path: ~/.composer/cache
104-
key: php-${{ matrix.php-version }}-composer-${{ matrix.laravel-version }}
105-
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.laravel-version }}-
106-
107123
- run: composer require illuminate/support:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-progress
108124

109-
- run: vendor/bin/phpunit --colors=always
125+
- run: vendor/bin/phpunit
110126

111127
coverage:
112128
runs-on: ubuntu-20.04
113129

114-
strategy:
115-
matrix:
116-
php-version:
117-
- 8.1
118-
laravel-version:
119-
- ^9
120-
121130
steps:
122-
- uses: actions/checkout@v2
131+
- uses: actions/checkout@v4
123132

124133
- uses: shivammathur/setup-php@v2
125134
with:
126135
coverage: pcov
127136
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
128-
php-version: ${{ matrix.php-version }}
137+
php-version: 8.3
129138

130-
- uses: actions/cache@v1
131-
with:
132-
path: ~/.composer/cache
133-
key: php-${{ matrix.php-version }}-composer-${{ matrix.laravel-version }}
134-
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.laravel-version }}-
135-
136-
- run: composer require illuminate/support:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-progress
139+
- uses: ramsey/composer-install@v3
137140

138141
- run: vendor/bin/phpunit --coverage-clover=coverage.xml
139142

140-
- uses: codecov/codecov-action@v2
143+
- uses: codecov/codecov-action@v4
141144
with:
142145
token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
vendor
2-
composer.lock
31
.DS_Store
42
.idea/
3+
.phpunit.result.cache
4+
composer.lock
5+
vendor

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"homepage": "https://github.com/mll-lab/laravel-comment",
2020
"require": {
2121
"php": "^7.1 || ^8",
22-
"illuminate/contracts": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10",
23-
"illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10"
22+
"illuminate/contracts": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10 || ^11",
23+
"illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6 || ^7 || ^8 || ^9 || ^10 || ^11"
2424
},
2525
"require-dev": {
2626
"ergebnis/composer-normalize": "^2",
2727
"fakerphp/faker": "^1.8",
28-
"orchestra/testbench": "~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ^4 || ^5 || ^6 || ^7 || ^8",
29-
"phpunit/phpunit": "^7.5 || ^8.4 || ^9 || ^10"
28+
"orchestra/testbench": "~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9",
29+
"phpunit/phpunit": "^7.5 || ^8.4 || ^9 || ^10 || ^11"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)