Skip to content

Commit b09a7b8

Browse files
committed
Add yaml-sort-checker to dev dependencies
Drop support for PHP 8.0
1 parent e4acfdc commit b09a7b8

File tree

3 files changed

+966
-33
lines changed

3 files changed

+966
-33
lines changed

.github/workflows/php.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
php: [8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
10+
php: [8.1, 8.2, 8.3, 8.4, 8.5]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2
@@ -23,12 +23,7 @@ jobs:
2323
- name: Running phpcs
2424
run: composer run-script cs
2525

26-
# The yaml-sort-checker library requires PHP 8.1 or higher,
27-
# but we want to support older PHP versions,
28-
# so we install the library here
29-
# and not using composer.json
3026
- name: Running yaml-sort-checker
31-
if: ${{ matrix.php >= '8.1' }}
3227
run: composer run-script yaml-sort-check
3328

3429
- name: Run tests

composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
3131
}
3232
],
3333
"require": {
34-
"php": ">=8.0"
34+
"php": ">=8.1"
3535
},
3636
"require-dev": {
3737
"ext-curl": "*",
3838
"phpunit/phpunit": "9.6.20",
3939
"mediawiki/mediawiki-codesniffer": "47.0.0",
40-
"mustangostang/spyc": "0.6.3"
40+
"mustangostang/spyc": "0.6.3",
41+
"mhujer/yaml-sort-checker": "^1.5"
4142
},
4243

4344
"support": {
@@ -53,11 +54,12 @@
5354
"scripts": {
5455
"fix": "phpcbf",
5556
"cs": "phpcs -sp",
56-
"yaml-sort-check": "composer require mhujer/yaml-sort-checker; yaml-sort-checker",
57+
"yaml-sort-check": "yaml-sort-checker",
5758
"test": [
5859
"@composer validate --no-interaction",
5960
"phpunit",
60-
"@cs"
61+
"@cs",
62+
"@yaml-sort-check"
6163
]
6264
},
6365
"config": {

0 commit comments

Comments
 (0)