Skip to content

Commit fcaa902

Browse files
spawniaspawnia
authored
Support Laravel 11
1 parent decdf37 commit fcaa902

File tree

4 files changed

+54
-39
lines changed

4 files changed

+54
-39
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

+43-26
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
- 8.0
2424
- 8.1
2525
- 8.2
26+
- 8.3
2627
laravel-version:
28+
- 5.5.*
2729
- 5.6.*
2830
- 5.7.*
2931
- 5.8.*
@@ -32,6 +34,7 @@ jobs:
3234
- ^8
3335
- ^9
3436
- ^10
37+
- ^11
3538
exclude:
3639
- php-version: 7.1
3740
laravel-version: ^6
@@ -43,20 +46,30 @@ jobs:
4346
laravel-version: ^9
4447
- php-version: 7.1
4548
laravel-version: ^10
49+
- php-version: 7.1
50+
laravel-version: ^11
4651
- php-version: 7.2
4752
laravel-version: ^8
4853
- php-version: 7.2
4954
laravel-version: ^9
5055
- php-version: 7.2
5156
laravel-version: ^10
57+
- php-version: 7.2
58+
laravel-version: ^11
5259
- php-version: 7.3
5360
laravel-version: ^9
5461
- php-version: 7.3
5562
laravel-version: ^10
63+
- php-version: 7.3
64+
laravel-version: ^11
5665
- php-version: 7.4
5766
laravel-version: ^9
5867
- php-version: 7.4
5968
laravel-version: ^10
69+
- php-version: 7.4
70+
laravel-version: ^11
71+
- php-version: 8.0
72+
laravel-version: 5.5.*
6073
- php-version: 8.0
6174
laravel-version: 5.6.*
6275
- php-version: 8.0
@@ -69,6 +82,10 @@ jobs:
6982
laravel-version: ^7
7083
- php-version: 8.0
7184
laravel-version: ^10
85+
- php-version: 8.0
86+
laravel-version: ^11
87+
- php-version: 8.1
88+
laravel-version: 5.5.*
7289
- php-version: 8.1
7390
laravel-version: 5.6.*
7491
- php-version: 8.1
@@ -79,6 +96,10 @@ jobs:
7996
laravel-version: ^6
8097
- php-version: 8.1
8198
laravel-version: ^7
99+
- php-version: 8.1
100+
laravel-version: ^11
101+
- php-version: 8.2
102+
laravel-version: 5.5.*
82103
- php-version: 8.2
83104
laravel-version: 5.6.*
84105
- php-version: 8.2
@@ -89,54 +110,50 @@ jobs:
89110
laravel-version: ^6
90111
- php-version: 8.2
91112
laravel-version: ^7
113+
- php-version: 8.3
114+
laravel-version: 5.5.*
115+
- php-version: 8.3
116+
laravel-version: 5.6.*
117+
- php-version: 8.3
118+
laravel-version: 5.7.*
119+
- php-version: 8.3
120+
laravel-version: 5.8.*
121+
- php-version: 8.3
122+
laravel-version: ^6
123+
- php-version: 8.3
124+
laravel-version: ^7
92125

93126
steps:
94-
- uses: actions/checkout@v2
127+
- uses: actions/checkout@v4
95128

96129
- uses: shivammathur/setup-php@v2
97130
with:
98131
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
99132
php-version: ${{ matrix.php-version }}
100133

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-
107134
- run: composer require illuminate/support:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-progress
108135

109-
- run: vendor/bin/phpunit --colors=always
136+
- if: matrix.laravel-version == ^11
137+
run: vendor/bin/phpunit --coverage-filter=src
138+
- if: matrix.laravel-version != ^11
139+
run: vendor/bin/phpunit
110140

111141
coverage:
112142
runs-on: ubuntu-20.04
113143

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

124147
- uses: shivammathur/setup-php@v2
125148
with:
126149
coverage: pcov
127150
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
128-
php-version: ${{ matrix.php-version }}
151+
php-version: 8.3
129152

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
153+
- uses: ramsey/composer-install@v3
137154

138-
- run: vendor/bin/phpunit --coverage-clover=coverage.xml
155+
- run: vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-filter=src
139156

140-
- uses: codecov/codecov-action@v2
157+
- uses: codecov/codecov-action@v4
141158
with:
142159
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-7
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": {
@@ -45,9 +45,6 @@
4545
}
4646
},
4747
"extra": {
48-
"branch-alias": {
49-
"dev-master": "1.0-dev"
50-
},
5148
"laravel": {
5249
"providers": [
5350
"\\Actuallymab\\LaravelComment\\LaravelCommentServiceProvider"

0 commit comments

Comments
 (0)