Skip to content

Commit 3070da4

Browse files
committed
Fix CI
1 parent 05bb325 commit 3070da4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/php-qa.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ jobs:
5050
coverage: none
5151
tools: cs2pr
5252

53+
- name: Remove unnecessary dependencies
54+
run: composer remove --dev --no-update "phpunit/phpunit"
55+
5356
- name: Install dependencies
5457
uses: ramsey/composer-install@v3
5558

@@ -91,9 +94,11 @@ jobs:
9194
ini-values: zend.assertions=1, error_reporting=E_ALL, display_errors=On
9295
coverage: ${{ ((env.USE_COVERAGE == 'yes') && 'xdebug') || 'none' }}
9396

94-
- name: Adjust WP version
97+
- name: Adjust dependencies
9598
run: |
9699
composer remove --dev --no-update "roots/wordpress-no-content"
100+
composer remove --dev --no-update "inpsyde/php-coding-standards"
101+
composer remove --dev --no-update "vimeo/psalm"
97102
composer remove --dev --no-update "phpunit/phpunit"
98103
composer require --no-update "roots/wordpress-no-content:${{ matrix.wp-ver }}"
99104
composer require --no-update "phpunit/phpunit:^9.6.29"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"roots/wordpress-no-content": ">=6.8.3",
3838
"roave/security-advisories": "dev-latest",
3939
"inpsyde/php-coding-standards": "^2.0.2",
40-
"vimeo/psalm": "^5.26.1",
40+
"vimeo/psalm": "^5.26.1 || ^6.13.1",
4141
"phpunit/phpunit": "^9.6.29"
4242
},
4343
"autoload": {

0 commit comments

Comments
 (0)