Skip to content

Commit 8c72914

Browse files
author
Andrey Helldar
committed
Added support for 3 version of the andrey-helldar/support package
1 parent 5476db8 commit 8c72914

File tree

2 files changed

+25
-44
lines changed

2 files changed

+25
-44
lines changed

‎.github/workflows/phpunit.yml‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ jobs:
1010
matrix:
1111
php: [ "7.2", "7.3", "7.4" ]
1212
laravel: [ "5.4.*" ]
13+
support: [ "2.0", "3.0" ]
1314

14-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
15+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
1516

1617
steps:
1718
- name: Checkout code
@@ -29,7 +30,7 @@ jobs:
2930

3031
- name: Install dependencies
3132
run: |
32-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:~5.7
33+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:~5.7
3334
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
3435
3536
- name: Execute tests
@@ -43,8 +44,9 @@ jobs:
4344
matrix:
4445
php: [ "7.2", "7.3", "7.4" ]
4546
laravel: [ "5.5.*" ]
47+
support: [ "2.0", "3.0" ]
4648

47-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
49+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
4850

4951
steps:
5052
- name: Checkout code
@@ -62,7 +64,7 @@ jobs:
6264

6365
- name: Install dependencies
6466
run: |
65-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:~6.0
67+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:~6.0
6668
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
6769
6870
- name: Execute tests
@@ -76,8 +78,9 @@ jobs:
7678
matrix:
7779
php: [ "7.2", "7.3", "7.4" ]
7880
laravel: [ "5.6.*" ]
81+
support: [ "2.0", "3.0" ]
7982

80-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
83+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
8184

8285
steps:
8386
- name: Checkout code
@@ -95,7 +98,7 @@ jobs:
9598

9699
- name: Install dependencies
97100
run: |
98-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:~7.0
101+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:~7.0
99102
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
100103
101104
- name: Execute tests
@@ -109,8 +112,9 @@ jobs:
109112
matrix:
110113
php: [ "7.2", "7.3", "7.4" ]
111114
laravel: [ "5.7.*" ]
115+
support: [ "2.0", "3.0" ]
112116

113-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
117+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
114118

115119
steps:
116120
- name: Checkout code
@@ -128,7 +132,7 @@ jobs:
128132

129133
- name: Install dependencies
130134
run: |
131-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:~7.0
135+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:~7.0
132136
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
133137
134138
- name: Execute tests
@@ -142,8 +146,9 @@ jobs:
142146
matrix:
143147
php: [ "7.2", "7.3", "7.4" ]
144148
laravel: [ "5.8.*" ]
149+
support: [ "2.0", "3.0" ]
145150

146-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
151+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
147152

148153
steps:
149154
- name: Checkout code
@@ -161,7 +166,7 @@ jobs:
161166

162167
- name: Install dependencies
163168
run: |
164-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:^8.0
169+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:^8.0
165170
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
166171
167172
- name: Execute tests
@@ -175,8 +180,9 @@ jobs:
175180
matrix:
176181
php: [ "7.2", "7.3", "7.4", "8.0" ]
177182
laravel: [ "^6.0" ]
183+
support: [ "2.0", "3.0" ]
178184

179-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
185+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
180186

181187
steps:
182188
- name: Checkout code
@@ -194,7 +200,7 @@ jobs:
194200

195201
- name: Install dependencies
196202
run: |
197-
composer require laravel/framework:${{ matrix.laravel }} phpunit/phpunit:^8.3
203+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} phpunit/phpunit:^8.3
198204
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
199205
200206
- name: Execute tests
@@ -208,8 +214,9 @@ jobs:
208214
matrix:
209215
php: [ "7.2", "7.3", "7.4", "8.0" ]
210216
laravel: [ "^7.0" ]
217+
support: [ "2.0", "3.0" ]
211218

212-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
219+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
213220

214221
steps:
215222
- name: Checkout code
@@ -227,7 +234,7 @@ jobs:
227234

228235
- name: Install dependencies
229236
run: |
230-
composer require laravel/framework:${{ matrix.laravel }}
237+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }}
231238
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
232239
233240
- name: Execute tests
@@ -241,8 +248,9 @@ jobs:
241248
matrix:
242249
php: [ "7.3", "7.4", "8.0" ]
243250
laravel: [ "^8.0" ]
251+
support: [ "2.0", "3.0" ]
244252

245-
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
253+
name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
246254

247255
steps:
248256
- name: Checkout code
@@ -260,35 +268,8 @@ jobs:
260268

261269
- name: Install dependencies
262270
run: |
263-
composer require laravel/framework:${{ matrix.laravel }}
271+
composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }}
264272
composer update --prefer-stable --prefer-dist --no-progress --no-interaction
265273
266274
- name: Execute tests
267275
run: vendor/bin/phpunit
268-
269-
scrutinizer:
270-
runs-on: ubuntu-latest
271-
272-
name: Coverage
273-
274-
steps:
275-
- name: Checkout code
276-
uses: actions/checkout@v2
277-
278-
- name: Setup PHP
279-
uses: shivammathur/setup-php@v2
280-
with:
281-
php-version: 7.4
282-
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
283-
coverage: xdebug
284-
285-
- name: Composer self update
286-
run: composer self-update
287-
288-
- name: Install dependencies
289-
run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
290-
291-
- name: Execute tests
292-
run: |
293-
mkdir -p build/logs
294-
vendor/bin/phpunit --coverage-text

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"php": "^7.2|^8.0",
2323
"ext-json": "*",
2424
"andrey-helldar/laravel-routes-core": "^2.0",
25-
"andrey-helldar/support": "^2.0",
25+
"andrey-helldar/support": "^2.0|^3.0",
2626
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
2727
"illuminate/http": "^5.0|^6.0|^7.0|^8.0",
2828
"illuminate/routing": "^5.0|^6.0|^7.0|^8.0",

0 commit comments

Comments
 (0)