Skip to content

Commit 616760d

Browse files
actions-useractions-user
committed
Auto-merge master back to develop
2 parents bc3d769 + a2e5d68 commit 616760d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4442
-864
lines changed

‎.coveralls.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.distignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
/artifacts
2121

2222
.DS_Store
23-
.coveralls.yml
2423
.distignore
2524
.dockerignore
2625
.env

‎.github/workflows/deploy-docker-image.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
php: [ '8.1', '8.0', '7.4', '7.3' ]
17-
wordpress: [ '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1', '6.0', '5.9', '5.8', '5.7', '5.6', '5.5' ]
17+
wordpress: [ '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1', '6.0' ]
1818
include:
1919
# WordPress versions above the PHP testing matrix.
2020
- wordpress: '6.7'
@@ -73,15 +73,6 @@ jobs:
7373
php: '7.3'
7474
- wordpress: '6.0'
7575
php: '7.3'
76-
# WordPress versions that don't support PHP versions in the matrix (too old)
77-
- wordpress: '5.7'
78-
php: '8.1'
79-
- wordpress: '5.6'
80-
php: '8.1'
81-
- wordpress: '5.5'
82-
php: '8.1'
83-
- wordpress: '5.5'
84-
php: '8.0'
8576

8677
fail-fast: false
8778
name: WordPress ${{ matrix.wordpress }} on PHP ${{ matrix.php }}

‎.github/workflows/testing-integration.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ jobs:
6060
php: '8.1'
6161
- wordpress: '6.0'
6262
php: '7.4'
63-
- wordpress: '5.9'
64-
php: '8.1'
65-
# Minimum plugin requirement:
66-
- wordpress: '5.9'
67-
php: '7.3'
6863

6964
steps:
7065
- name: Checkout
@@ -112,7 +107,9 @@ jobs:
112107

113108
- name: Push Codecoverage to Coveralls.io
114109
if: ${{ matrix.coverage == 1 }}
115-
env:
116-
COVERALLS_RUN_LOCALLY: 1
117-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118-
run: vendor/bin/php-coveralls -v
110+
uses: coverallsapp/github-action@v2
111+
with:
112+
github-token: ${{ secrets.GITHUB_TOKEN }}
113+
file: tests/_output/coverage.xml
114+
flag-name: wpunit
115+
format: clover

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ node_modules
5151
# Config for Codeception. Used to override the codeception.dist.yml
5252
codeception.yml
5353

54-
# Used to send code coverage to Coveralls
55-
php-coveralls.phar
56-
5754
# Log files
5855
.log
5956

‎composer.json‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^7.1 || ^8.0",
26-
"webonyx/graphql-php": "14.11.10",
25+
"php": "^7.4 || ^8.0",
26+
"webonyx/graphql-php": "15.19.1",
2727
"ivome/graphql-relay-php": "0.7.0",
2828
"appsero/client": "2.0.4"
2929
},
@@ -38,21 +38,20 @@
3838
"codeception/module-webdriver": "^1.0",
3939
"codeception/util-universalframework": "^1.0",
4040
"lucatume/wp-browser": "<3.5",
41-
"phpcompatibility/phpcompatibility-wp": "^2.1",
4241
"phpcompatibility/php-compatibility": "dev-develop as 9.9.9",
42+
"phpcompatibility/phpcompatibility-wp": "^2.1",
4343
"phpstan/extension-installer": "^1.1",
44-
"phpstan/phpstan": "~1.12.12",
44+
"phpstan/phpstan-deprecation-rules": "^2.0.1",
45+
"phpstan/phpstan": "~2.1.2",
4546
"phpunit/phpunit": "^9.5",
46-
"php-coveralls/php-coveralls": "^2.5",
4747
"slevomat/coding-standard": "^8.9",
48-
"szepeviktor/phpstan-wordpress": "~1.3.0",
49-
"wp-graphql/wp-graphql-testcase": "^3.0",
48+
"szepeviktor/phpstan-wordpress": "~2.0.1",
5049
"wp-cli/wp-cli-bundle": "^2.8",
51-
"phpstan/phpstan-deprecation-rules": "^1.2"
50+
"wp-graphql/wp-graphql-testcase": "^3.0"
5251
},
5352
"config": {
5453
"platform": {
55-
"php": "7.3"
54+
"php": "7.4"
5655
},
5756
"optimize-autoloader": true,
5857
"process-timeout": 0,

0 commit comments

Comments
 (0)