Skip to content

Commit d4f6fce

Browse files
authored
Merge branch 'master' into update-js
2 parents 8173be7 + c26bfb7 commit d4f6fce

File tree

7 files changed

+210
-177
lines changed

7 files changed

+210
-177
lines changed

.gitattributes

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
.editorconfig export-ignore
2+
.eslintrc.json export-ignore
23
.gitattributes export-ignore
4+
.github/ export-ignore
35
.gitignore export-ignore
4-
Doxyfile export-ignore
5-
composer.json export-ignore
66
.phpcs.xml export-ignore
7-
phpunit.xml export-ignore
8-
tests/ export-ignore
9-
.github/ export-ignore
10-
.eslintrc.json export-ignore
7+
composer.json export-ignore
8+
composer.lock export-ignore
9+
docs/ export-ignore
1110
package-lock.json export-ignore
1211
package.json export-ignore
13-
docs/ export-ignore
12+
phpunit.xml export-ignore
13+
tests/ export-ignore
14+
yaml-sort-checker.yml export-ignore

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
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]
10+
php: [8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
}
3232
],
3333
"require": {
34-
"php": ">=8.0",
35-
"mustangostang/spyc": "0.6.3"
34+
"php": ">=8.0"
3635
},
3736
"require-dev": {
3837
"ext-curl": "*",
3938
"phpunit/phpunit": "9.6.20",
40-
"mediawiki/mediawiki-codesniffer": "47.0.0"
39+
"mediawiki/mediawiki-codesniffer": "47.0.0",
40+
"mustangostang/spyc": "0.6.3"
4141
},
4242

4343
"support": {

0 commit comments

Comments
 (0)